--- a/tests/test-merge-criss-cross.t Thu Jun 25 13:16:55 2020 +0530
+++ b/tests/test-merge-criss-cross.t Thu Sep 03 13:25:29 2020 +0530
@@ -78,9 +78,9 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922
- preserving f2 for resolve of f2
f1: remote is newer -> g
getting f1
+ preserving f2 for resolve of f2
f2: versions differ -> m (premerge)
picked tool ':dump' for f2 (binary False symlink False changedelete False)
merging f2