Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2.out @ 807:5e779f96edb0
Include tests (or possibly maps) ending in numbers in MANIFEST, too.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 22:31:45 +0100 |
parents | 1f9ec150a476 |
children | 8f5637f0a0c0 |
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