--- a/tests/test-merge-criss-cross.t Thu Sep 03 14:45:16 2020 +0530
+++ b/tests/test-merge-criss-cross.t Wed Aug 26 17:24:22 2020 +0530
@@ -149,7 +149,7 @@
f1: versions differ -> m
f2: remote unchanged -> k
- auction for merging merge bids
+ auction for merging merge bids (2 ancestors)
f1: picking 'get' action
f2: picking 'keep' action
end of auction
@@ -192,7 +192,7 @@
f1: versions differ -> m
f2: remote is newer -> g
- auction for merging merge bids
+ auction for merging merge bids (2 ancestors)
f1: picking 'keep' action
f2: picking 'get' action
end of auction
@@ -230,7 +230,7 @@
calculating bids for ancestor 40663881a6dd
resolving manifests
- auction for merging merge bids
+ auction for merging merge bids (2 ancestors)
f1: picking 'get' action
f2: picking 'keep' action
end of auction
@@ -257,7 +257,7 @@
f1: versions differ -> m
f2: remote unchanged -> k
- auction for merging merge bids
+ auction for merging merge bids (2 ancestors)
f1: picking 'get' action
f2: picking 'keep' action
end of auction
@@ -343,7 +343,7 @@
calculating bids for ancestor b211bbc6eb3c
resolving manifests
- auction for merging merge bids
+ auction for merging merge bids (2 ancestors)
x: multiple bids for merge action:
versions differ -> m
versions differ -> m
@@ -430,7 +430,7 @@
d1/b: other deleted -> r
d2/b: remote created -> g
- auction for merging merge bids
+ auction for merging merge bids (2 ancestors)
d1/a: consensus for r
d1/b: consensus for r
d2/b: consensus for g