--- a/tests/test-rebase-interruptions.t Fri Feb 08 16:27:49 2013 -0600
+++ b/tests/test-rebase-interruptions.t Fri Feb 08 16:17:46 2013 -0600
@@ -62,7 +62,7 @@
warning: conflicts during merge.
merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
- [255]
+ [1]
Force a commit on C during the interruption:
@@ -98,7 +98,7 @@
warning: conflicts during merge.
merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
- [255]
+ [1]
Solve the conflict and go on:
@@ -152,7 +152,7 @@
warning: conflicts during merge.
merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
- [255]
+ [1]
Force a commit on B' during the interruption:
@@ -223,7 +223,7 @@
warning: conflicts during merge.
merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
- [255]
+ [1]
Change phase on B and B'