Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 175:0eb6e2c9800d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg: remove some debug commands, improve help messages, add .hgpaths file .hgpaths is a file with lines of the form: <symbolic name> <repository path or url> that allows you to do: hg merge <name>
author mpm@selenic.com
date Thu, 26 May 2005 23:39:42 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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