--- a/tests/test-merge-criss-cross.t Fri Jan 24 07:00:45 2020 -0800
+++ b/tests/test-merge-criss-cross.t Wed Jan 22 15:20:12 2020 -0800
@@ -410,11 +410,6 @@
note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e
calculating bids for ancestor 11b5b303e36c
- unmatched files in local:
- d1/a
- d1/b
- unmatched files in other:
- d2/b
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9