Mercurial > hg

view tkmerge @ 83:9fd5b35cfc45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add -q quiet option Make -d and -v do something Add a bunch of debug and note messages
author mpm@selenic.com
date Tue, 17 May 2005 11:06:59 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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