Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge2.out @ 925:5a034646e472
run-tests: remove '+ hg' trick
This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.
author | mpm@selenic.com |
---|---|
date | Tue, 16 Aug 2005 19:03:01 -0800 |
parents | 0902ffece4b4 |
children | b2ae81a7df29 |
line wrap: on
line diff
--- a/tests/test-merge2.out +++ b/tests/test-merge2.out @@ -1,25 +1,2 @@ -+ 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