Mercurial > hg

view tkmerge @ 148:c32286d0a665

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve pruning of branches in outstanding changeset algorithm These changes make the client keep track of what it's seen more carefully to avoid some redundant requests.
author mpm@selenic.com
date Tue, 24 May 2005 23:13:25 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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