Mercurial > hg > mercurial-crew-with-dirclash
annotate tkmerge @ 136:0e8d60d2bb2b
added annotate
fixed error page to get tmpl_dir
author | jake@edge2.net |
---|---|
date | Sat, 21 May 2005 22:43:14 -0700 |
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 |