tkmerge
author mpm@selenic.com
Wed, 11 May 2005 15:06:41 -0800
changeset 56 ad2ea1185f04
parent 0 9117c6561b0b
permissions -rw-r--r--
Add getchangegroup code to efficiently calculate and request a changegroup

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