author | mpm@selenic.com |
Tue, 10 May 2005 00:31:00 -0800 | |
changeset 42 | 91f1fa847158 |
parent 0 | 9117c6561b0b |
permissions | -rw-r--r-- |
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 |