changeset 42110 | 3a7efcbdf288 |
parent 39506 | f1186c292d03 |
child 45846 | 8d72e29ad1e0 |
--- a/tests/test-bundle-r.t Fri Apr 12 12:20:38 2019 -0400 +++ b/tests/test-bundle-r.t Fri Apr 12 09:41:08 2019 -0700 @@ -317,8 +317,8 @@ $ cd ../test $ hg merge 7 note: possible conflict - afile was renamed multiple times to: + adifferentfile anotherfile - adifferentfile 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg ci -m merge