tkmerge
author mpm@selenic.com
Thu, 05 May 2005 15:05:50 -0800
changeset 29 4d3a5dcb6972
parent 0 9117c6561b0b
permissions -rw-r--r--
Make diffdir take a revision argument

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