tkmerge
author mpm@selenic.com
Thu, 26 May 2005 22:47:43 -0800
changeset 173 8da1df932c16
parent 0 9117c6561b0b
permissions -rw-r--r--
hgweb: make navigation of changesets a bit nicer

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