--- a/tests/test-rebase-conflicts.t	Fri Aug 15 19:43:32 2014 +0200
+++ b/tests/test-rebase-conflicts.t	Fri Apr 18 13:33:20 2014 +0200
@@ -245,7 +245,10 @@
    f1.txt: remote is newer -> g
   getting f1.txt
   updating: f1.txt 1/1 files (100.00%)
+  committing files:
   f1.txt
+  committing manifest
+  committing changelog
   rebased as 19c888675e13
   rebasing 10:2f2496ddf49d "merge" (tip)
   rebasing: 10:2f2496ddf49d 6/6 changesets (100.00%)
@@ -261,7 +264,10 @@
    f1.txt: remote is newer -> g
   getting f1.txt
   updating: f1.txt 1/1 files (100.00%)
+  committing files:
   f1.txt
+  committing manifest
+  committing changelog
   rebased as 2a7f09cac94c
   rebase merging completed
   update back to initial working directory parent