--- a/tests/test-rebase-conflicts.out Wed May 19 22:32:40 2010 +0200
+++ b/tests/test-rebase-conflicts.out Wed May 19 19:46:39 2010 -0500
@@ -26,7 +26,6 @@
abort: unresolved merge conflicts (see hg resolve)
% Conclude rebase
-saving bundle to
adding branch
adding changesets
adding manifests