Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge3.out @ 829:764b0350acb8
Shortened hgmerge a little bit.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 04 Aug 2005 17:16:41 +0100 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
rev | line source |
---|---|
402 | 1 + hg init |
2 + hg add a | |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
775
diff
changeset
|
3 + hg commit -m commit #0 -d 0 0 |
402 | 4 + hg add b |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
775
diff
changeset
|
5 + hg commit -A -mcomment #1 -d 0 0 |
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
6 removing b |
402 | 7 b never committed! |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
775
diff
changeset
|
8 nothing changed |