Mercurial > hg
diff tests/test-merge-commit.t @ 42167:91a0bc50b288
copies: delete debug message about search limit
I'm about to rewrite mergecopies() and this message will no longer be
emitted then. Let's remove the message now to remove a distraction
from that patch.
Differential Revision: https://phab.mercurial-scm.org/D6249
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 11 Apr 2019 23:28:38 -0700 |
parents | d4e62df1c73d |
children | 69429972ff1f |
line wrap: on
line diff
--- a/tests/test-merge-commit.t Mon Apr 15 22:58:10 2019 -0700 +++ b/tests/test-merge-commit.t Thu Apr 11 23:28:38 2019 -0700 @@ -67,7 +67,6 @@ This should use bar@rev2 as the ancestor: $ hg --debug merge 3 - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 @@ -155,7 +154,6 @@ This should use bar@rev2 as the ancestor: $ hg --debug merge 3 - searching for copies back to rev 1 resolving manifests branchmerge: True, force: False, partial: False ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0