tkmerge
author mpm@selenic.com
Thu, 12 May 2005 01:22:37 -0800
changeset 61 1215bf60468f
parent 0 9117c6561b0b
permissions -rw-r--r--
Add server side of hg:// protocol to hgweb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
     1
merge $1 $3 $2 || tkdiff -conflict $1 -o $1
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
     2