Mercurial > hg > pyhgsh

view tkmerge @ 45:f2b2d5daec30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix recursion depth trouble with ancestor algorithm
author mpm@selenic.com
date Tue, 10 May 2005 00:34:57 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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