tests/test-double-merge.t
changeset 44272 17e12938f8e7
parent 42209 91a0bc50b288
child 46076 69429972ff1f
--- 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