tkmerge
author mpm@selenic.com
Thu, 26 May 2005 13:02:28 -0800
changeset 170 e6c621a825f2
parent 0 9117c6561b0b
permissions -rw-r--r--
hg diff: fix missing final newline bug

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