Mercurial > hg > mercurial-crew-with-dirclash
annotate tkmerge @ 233:33c48b635690
Add missing > to </td> in templates.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 02 Jun 2005 07:05:56 +0100 |
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 |