Mercurial > hg > pyhgsh

view tkmerge @ 152:67b8d24d2dbe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb is no longer a script
author jake@edge2.net
date Tue, 24 May 2005 07:33:12 -0700
parents 9117c6561b0b
children
line wrap: on
line source

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