tkmerge
author mpm@selenic.com
Fri, 20 May 2005 17:36:02 -0800
changeset 117 2ac722ad1a9d
parent 0 9117c6561b0b
permissions -rw-r--r--
Make revision code slightly faster

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