tkmerge
author mpm@selenic.com
Sat, 07 May 2005 16:13:26 -0800
changeset 38 ed1d3e3ca8e0
parent 0 9117c6561b0b
permissions -rw-r--r--
Add improved rev lookup to diff and export

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