--- a/tests/test-rebase-check-restore.out Fri Oct 01 16:43:03 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-
-% - Rebasing B onto E - check keep
-@ 5:F:notdefault
-|
-| o 4:E:
-| |
-| o 3:D:
-|/
-| o 2:C:
-| |
-| o 1:B:
-|/
-o 0:A:
-
-warning: conflicts during merge.
-merging A failed!
-abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
-merging A
-
-% - Solve the conflict and go on
-@ 7:C:
-|
-o 6:B:
-|
-| o 5:F:notdefault
-| |
-o | 4:E:
-| |
-o | 3:D:
-|/
-| o 2:C:
-| |
-| o 1:B:
-|/
-o 0:A:
-
-
-% - Rebase F onto E - check keepbranches
-@ 5:F:notdefault
-|
-| o 4:E:
-| |
-| o 3:D:
-|/
-| o 2:C:
-| |
-| o 1:B:
-|/
-o 0:A:
-
-warning: conflicts during merge.
-merging A failed!
-abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
-merging A
-
-% - Solve the conflict and go on
-saved backup bundle to
-@ 5:F:notdefault
-|
-o 4:E:
-|
-o 3:D:
-|
-| o 2:C:
-| |
-| o 1:B:
-|/
-o 0:A:
-