author | mpm@selenic.com |
Wed, 18 May 2005 16:45:44 -0800 | |
changeset 96 | fce47326677c |
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 |