--- a/tests/test-rename-merge1.t Mon Apr 15 22:58:10 2019 -0700
+++ b/tests/test-rename-merge1.t Thu Apr 11 23:28:38 2019 -0700
@@ -22,7 +22,6 @@
created new head
$ hg merge -y --debug
- searching for copies back to rev 1
unmatched files in local:
c2
unmatched files in other:
@@ -168,7 +167,6 @@
$ hg commit -m "deleted file"
created new head
$ hg merge --debug
- searching for copies back to rev 1
unmatched files in other:
newfile
all copies found (* = to merge, ! = divergent, % = renamed and deleted):