changeset 22673 | 16a46003b50c |
parent 22672 | 19903277f035 |
child 23482 | 208ec8ca7c79 |
--- a/tests/test-merge-criss-cross.t Wed Oct 01 03:41:11 2014 +0200 +++ b/tests/test-merge-criss-cross.t Wed Oct 01 03:42:00 2014 +0200 @@ -210,7 +210,6 @@ $ hg up -qC $ hg merge - note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)