tkmerge
author mpm@selenic.com
Fri, 13 May 2005 13:12:32 -0800
changeset 67 a182f2561c8e
parent 0 9117c6561b0b
permissions -rw-r--r--
Add tag support

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