changeset 925 | 5a034646e472 |
parent 839 | 9c918287d10b |
child 2019 | ced2d3620f95 |
--- a/tests/test-merge5.out +++ b/tests/test-merge5.out @@ -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!