tkmerge
author mpm@selenic.com
Fri, 27 May 2005 12:42:52 -0800
changeset 179 ff5377a4b203
parent 0 9117c6561b0b
permissions -rw-r--r--
Add ~/.hgpaths to README

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