tkmerge
author jake@edge2.net
Fri, 13 May 2005 17:48:10 -0700
changeset 100 526722d24ee5
parent 0 9117c6561b0b
permissions -rw-r--r--
reorganize code into classes clean up html code for w3c validation
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