tkmerge
author mpm@selenic.com
Fri, 27 May 2005 12:45:41 -0800
changeset 180 f25944662097
parent 0 9117c6561b0b
permissions -rw-r--r--
hgweb: Fix navigate to 0 bug

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