Mercurial > hg > pyhgsh
diff tests/test-merge5.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 | 9c918287d10b |
| children | ced2d3620f95 |
line wrap: on
line diff
--- a/tests/test-merge5.out Tue Aug 16 17:30:41 2005 -0800 +++ b/tests/test-merge5.out Tue Aug 16 19:03:01 2005 -0800 @@ -1,11 +1,4 @@ -+ hg init -+ hg add a b -+ hg commit -m commit #0 -d 0 0 -+ hg commit -mcomment #1 -d 0 0 -+ hg update 0 -+ hg commit -A -mcomment #2 -d 0 0 removing b -+ hg update 1 this update spans a branch affecting the following files: b aborting update spanning branches!