--- a/tests/test-rebase-conflicts.t Wed Jun 28 17:41:25 2017 +0200
+++ b/tests/test-rebase-conflicts.t Thu Jun 29 15:21:52 2017 -0700
@@ -226,6 +226,7 @@
ignoring null merge rebase of 8
rebasing 9:e31216eec445 "more changes to f1"
future parents are 2 and -1
+ rebase status stored
update to 2:4bc80088dc6b
resolving manifests
branchmerge: False, force: True, partial: False
@@ -248,9 +249,11 @@
f1.txt
committing manifest
committing changelog
+ updating the branch cache
rebased as 19c888675e13
rebasing 10:2f2496ddf49d "merge" (tip)
future parents are 11 and 7
+ rebase status stored
already in destination
merge against 10:2f2496ddf49d
detach base 9:e31216eec445
@@ -266,10 +269,9 @@
f1.txt
committing manifest
committing changelog
+ updating the branch cache
rebased as 2a7f09cac94c
rebase merging completed
- rebase status stored
- updating the branch cache
update back to initial working directory parent
resolving manifests
branchmerge: False, force: False, partial: False