--- a/tests/test-rebase-conflicts.t Tue Oct 18 00:00:43 2016 +0200
+++ b/tests/test-rebase-conflicts.t Thu Oct 13 02:19:43 2016 +0200
@@ -238,6 +238,8 @@
merge against 9:e31216eec445
detach base 8:8e4e2c1a07ae
searching for copies back to rev 3
+ unmatched files in other (from topological common ancestor):
+ f2.txt
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445
@@ -255,6 +257,8 @@
merge against 10:2f2496ddf49d
detach base 9:e31216eec445
searching for copies back to rev 3
+ unmatched files in other (from topological common ancestor):
+ f2.txt
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d