--- a/tests/test-merge-criss-cross.t Mon Sep 21 10:23:25 2020 -0400
+++ b/tests/test-merge-criss-cross.t Wed Sep 09 16:49:19 2020 +0530
@@ -431,8 +431,8 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9
- d1/a: ancestor missing, remote missing -> k
- d1/b: ancestor missing, remote missing -> k
+ d1/a: ancestor missing, remote missing -> kn
+ d1/b: ancestor missing, remote missing -> kn
d2/b: remote created -> g
calculating bids for ancestor 154e6000f54e
@@ -452,13 +452,13 @@
auction for merging merge bids (2 ancestors)
list of bids for d1/a:
- ancestor missing, remote missing -> k
+ ancestor missing, remote missing -> kn
other deleted -> r
- d1/a: picking 'keep' action
+ d1/a: picking 'keep new' action
list of bids for d1/b:
- ancestor missing, remote missing -> k
+ ancestor missing, remote missing -> kn
other deleted -> r
- d1/b: picking 'keep' action
+ d1/b: picking 'keep new' action
list of bids for d2/b:
remote created -> g
remote created -> g
@@ -467,8 +467,8 @@
d2/b: remote created -> g
getting d2/b
- d1/a: ancestor missing, remote missing -> k
- d1/b: ancestor missing, remote missing -> k
+ d1/a: ancestor missing, remote missing -> kn
+ d1/b: ancestor missing, remote missing -> kn
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)