diff -r 749b057b01f3 -r cf8ad0e6c0e4 tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t	Tue Mar 07 16:30:31 2017 -0800
+++ b/tests/test-rebase-conflicts.t	Tue Mar 07 16:27:32 2017 -0800
@@ -225,7 +225,6 @@
   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
@@ -251,7 +250,6 @@
   rebased as 19c888675e13
   rebasing 10:2f2496ddf49d "merge" (tip)
    future parents are 11 and 7
-  rebase status stored
    already in target
    merge against 10:2f2496ddf49d
      detach base 9:e31216eec445
@@ -269,6 +267,7 @@
   committing changelog
   rebased as 2a7f09cac94c
   rebase merging completed
+  rebase status stored
   update back to initial working directory parent
   resolving manifests
    branchmerge: False, force: False, partial: False