Mercurial > hg > pyhgsh

view tkmerge @ 72:4a6ab4d80dc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add an O(m + nlog n) patching extension
author mpm@selenic.com
date Mon, 16 May 2005 22:08:33 -0800
parents 9117c6561b0b
children
line wrap: on
line source

merge $1 $3 $2 || tkdiff -conflict $1 -o $1