Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge3.out @ 1675:03191e1a4230
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 01 Feb 2006 08:50:45 +0100 |
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 |