Mercurial > public > mercurial-scm > hg
diff tests/test-double-merge.t @ 44197:17e12938f8e7
copies: print debug information about copies per side/branch
Differential Revision: https://phab.mercurial-scm.org/D7987
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 24 Jan 2020 10:39:55 -0800 |
| parents | 91a0bc50b288 |
| children | 69429972ff1f |
line wrap: on
line diff
--- a/tests/test-double-merge.t Wed Jan 22 15:31:17 2020 -0800 +++ b/tests/test-double-merge.t Fri Jan 24 10:39:55 2020 -0800 @@ -29,7 +29,8 @@ unmatched files in other: bar all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'foo' -> dst: 'bar' * + on remote side: + src: 'foo' -> dst: 'bar' * checking for directory renames resolving manifests branchmerge: True, force: False, partial: False