Mercurial > hg > gitweb

view tkmerge @ 130:e6678a1beb6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make hg diff handle files that have been added but not yet committed.
author mpm@selenic.com
date Sat, 21 May 2005 17:26:44 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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