Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 38:ed1d3e3ca8e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add improved rev lookup to diff and export
author mpm@selenic.com
date Sat, 07 May 2005 16:13:26 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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