tkmerge
author mpm@selenic.com
Fri, 27 May 2005 13:09:56 -0800
changeset 182 089594a5bbde
parent 0 9117c6561b0b
permissions -rw-r--r--
Pull from Jake's hg docs

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