tkmerge
author mpm@selenic.com
Sat, 07 May 2005 16:10:50 -0800
changeset 35 9197c26a414b
parent 0 9117c6561b0b
permissions -rw-r--r--
unidiff: punt on comparing empty files

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