tkmerge
author mpm@selenic.com
Thu, 26 May 2005 10:08:47 -0800
changeset 165 7fc8385df514
parent 0 9117c6561b0b
permissions -rw-r--r--
Add tag/rev/node search to hgweb

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