tkmerge
author mpm@selenic.com
Fri, 20 May 2005 17:49:25 -0800
changeset 125 8913e13196e1
parent 0 9117c6561b0b
permissions -rw-r--r--
Remove python version of the patches code

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