changeset 44162 | baf3fe2977cc |
parent 42167 | 91a0bc50b288 |
child 49251 | ccd76e292be5 |
--- a/tests/test-issue522.t Fri Jan 24 07:00:45 2020 -0800 +++ b/tests/test-issue522.t Wed Jan 22 15:20:12 2020 -0800 @@ -25,8 +25,6 @@ $ hg ci -qAm 'add bar' $ hg merge --debug - unmatched files in local: - bar resolving manifests branchmerge: True, force: False, partial: False ancestor: bbd179dfa0a7, local: 71766447bdbb+, remote: 4d9e78aaceee