tkmerge
author mpm@selenic.com
Thu, 26 May 2005 10:11:05 -0800
changeset 166 39624c47060f
parent 0 9117c6561b0b
permissions -rw-r--r--
hgweb: don't blow up on search for unknown keys

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