tkmerge
author mpm@selenic.com
Sat, 21 May 2005 13:14:58 -0800
changeset 128 d6afb6dbf9f2
parent 0 9117c6561b0b
permissions -rw-r--r--
Add safety checking to mpatch

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