tkmerge
author mpm@selenic.com
Tue, 03 May 2005 18:39:58 -0800
changeset 5 5f249577ac40
parent 0 9117c6561b0b
permissions -rw-r--r--
Don't complain that help is an unknown command

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