tkmerge
author mpm@selenic.com
Thu, 12 May 2005 01:21:58 -0800
changeset 60 e32fdbd97839
parent 0 9117c6561b0b
permissions -rw-r--r--
Add hg:// protocol Fix some of the getchangegroup logic

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