tkmerge
author mpm@selenic.com
Thu, 12 May 2005 01:20:16 -0800
changeset 58 2ab801e0ea9f
parent 0 9117c6561b0b
permissions -rw-r--r--
A quick set of comparisons between hg, git, and bk

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