tkmerge
author mpm@selenic.com
Tue, 17 May 2005 00:33:22 -0800
changeset 76 d993ebd69d28
parent 0 9117c6561b0b
permissions -rw-r--r--
Add lazy{parser,index,map} to speed up processing of index files

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