tkmerge
author mpm@selenic.com
Wed, 18 May 2005 15:21:53 -0800
changeset 91 1c212bbb38d5
parent 0 9117c6561b0b
permissions -rw-r--r--
hack so that debugindex takes filenames

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