tkmerge
author mpm@selenic.com
Wed, 18 May 2005 15:23:10 -0800
changeset 92 e6fc7ff52246
parent 0 9117c6561b0b
permissions -rw-r--r--
Add debugindexdot to generate graphviz dot files from indexes

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