Mercurial > hg
diff tests/test-merge-criss-cross.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 | baf3fe2977cc |
children | e7c8a5030a90 |
line wrap: on
line diff
--- a/tests/test-merge-criss-cross.t Wed Jan 22 15:31:17 2020 -0800 +++ b/tests/test-merge-criss-cross.t Fri Jan 24 10:39:55 2020 -0800 @@ -419,7 +419,8 @@ unmatched files in other: d2/b all copies found (* = to merge, ! = divergent, % = renamed and deleted): - src: 'd1/b' -> dst: 'd2/b' + on remote side: + src: 'd1/b' -> dst: 'd2/b' checking for directory renames discovered dir src: 'd1/' -> dst: 'd2/' resolving manifests