Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 71:47c9a869adee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add mdiff.patches to speed up applying thousands of patches to the manifest
author mpm@selenic.com
date Sat, 14 May 2005 10:27:14 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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