tkmerge
author jake@edge2.net
Sat, 21 May 2005 11:46:16 -0700
changeset 132 210eeb6f5197
parent 0 9117c6561b0b
permissions -rw-r--r--
making hgweb class

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