changeset 42209 | 91a0bc50b288 |
parent 38262 | d0abd7949ea3 |
child 44272 | 17e12938f8e7 |
--- a/tests/test-rename-dir-merge.t Mon Apr 15 22:58:10 2019 -0700 +++ b/tests/test-rename-dir-merge.t Thu Apr 11 23:28:38 2019 -0700 @@ -24,7 +24,6 @@ created new head $ hg merge --debug 1 - searching for copies back to rev 1 unmatched files in local: a/c unmatched files in other: @@ -70,7 +69,6 @@ $ hg co -C 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg merge --debug 2 - searching for copies back to rev 1 unmatched files in local: b/a b/b