tkmerge
author mpm@selenic.com
Tue, 17 May 2005 01:22:50 -0800
changeset 80 5b7a444c794a
parent 0 9117c6561b0b
permissions -rw-r--r--
Fix field width for annotate Add blame

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