tkmerge
author mpm@selenic.com
Sat, 14 May 2005 10:27:14 -0800
changeset 71 47c9a869adee
parent 0 9117c6561b0b
permissions -rw-r--r--
Add mdiff.patches to speed up applying thousands of patches to the manifest

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