tkmerge
author mpm@selenic.com
Tue, 03 May 2005 13:27:13 -0800
changeset 1 273ce12ad8f1
parent 0 9117c6561b0b
permissions -rw-r--r--
Update README to discuss remote pull, rsync, and the hg repo add a .hgignore file

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