Mercurial > hg > mercurial-crew-with-dirclash
annotate tkmerge @ 59:2bff7c0ea1d3
Minor corrections
author | mpm@selenic.com |
---|---|
date | Thu, 12 May 2005 01:20:43 -0800 |
parents | 9117c6561b0b |
children |
rev | line source |
---|---|
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 |