Mercurial > hg > mercurial-crew-with-dirclash
annotate tkmerge @ 106:e8d4bbf4c9e2
Don't diff unknown files
Fix syntax error from log date
author | mpm@selenic.com |
---|---|
date | Wed, 18 May 2005 17:37:49 -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 |