tkmerge
author mpm@selenic.com
Tue, 17 May 2005 00:32:18 -0800
changeset 75 b942bbe4bb84
parent 0 9117c6561b0b
permissions -rw-r--r--
Fix a bug in patches() if there's not text and no patch

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