Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge3.out @ 1137:c54d03bdf2dc
Remove the link from the template as there no real way to have it always be correct.
author | Ollivier Robert <roberto@keltia.freenix.fr> |
---|---|
date | Sun, 28 Aug 2005 19:18:39 +0200 |
parents | 5a034646e472 |
children | 91c56c427171 |
rev | line source |
---|---|
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
1 removing b |
402 | 2 b never committed! |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
775
diff
changeset
|
3 nothing changed |