changeset 42167 | 91a0bc50b288 |
parent 28318 | 564a354f7f35 |
child 44197 | 17e12938f8e7 |
--- a/tests/test-double-merge.t Mon Apr 15 22:58:10 2019 -0700 +++ b/tests/test-double-merge.t Thu Apr 11 23:28:38 2019 -0700 @@ -26,7 +26,6 @@ summary: cp foo bar; change both $ hg merge --debug - searching for copies back to rev 1 unmatched files in other: bar all copies found (* = to merge, ! = divergent, % = renamed and deleted):