Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 147:b6d8ed7aeba0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A new ancestor algorithm The old ancestor algorithm could get fooled into returning ancestors closer to root than it ought to. Hopefully this one, which strictly orders its search by distance from room, will be foolproof.
author mpm@selenic.com
date Tue, 24 May 2005 23:11:44 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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