tkmerge
author jake@edge2.net
Mon, 30 May 2005 09:53:48 -0700
changeset 196 48827121af7e
parent 0 9117c6561b0b
permissions -rw-r--r--
add export, recover, and undo to the man page add export to hg help

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