Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2.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 |
line wrap: on
line source
+ hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg update 0 + hg add b + hg commit -m commit #2 -d 0 0 + hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg update 0 + hg commit -A -m commit #2 -d 0 0 adding b + hg init + hg add a + hg commit -m commit #0 -d 0 0 + hg add b + hg commit -m commit #1 -d 0 0 + hg remove b + hg update 0 + hg commit -A -m commit #2 -d 0 0 adding b