changeset 42209 | 91a0bc50b288 |
parent 37285 | d4e62df1c73d |
child 46076 | 69429972ff1f |
--- a/tests/test-merge7.t Mon Apr 15 22:58:10 2019 -0700 +++ b/tests/test-merge7.t Thu Apr 11 23:28:38 2019 -0700 @@ -81,7 +81,6 @@ new changesets 40d11a4173a8 (run 'hg heads' to see heads, 'hg merge' to merge) $ hg merge --debug - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8