changeset 12757 | 62c8f7691bc3 |
parent 12399 | 4fee1fd3de9a |
child 13446 | 1e497df514e2 |
--- a/tests/test-bundle-r.t Mon Oct 18 14:37:52 2010 +0200 +++ b/tests/test-bundle-r.t Sun Oct 10 09:50:25 2010 -0500 @@ -340,7 +340,7 @@ $ cd ../test $ hg merge 7 - warning: detected divergent renames of afile to: + note: possible conflict - afile was renamed multiple times to: anotherfile adifferentfile 2 files updated, 0 files merged, 0 files removed, 0 files unresolved