--- a/tests/test-rebase-check-restore.t Fri Feb 08 16:27:49 2013 -0600
+++ b/tests/test-rebase-check-restore.t Fri Feb 08 16:17:46 2013 -0600
@@ -70,7 +70,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:
@@ -123,7 +123,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: