--- a/tests/test-rebase-abort.t Fri Feb 08 16:27:49 2013 -0600
+++ b/tests/test-rebase-abort.t Fri Feb 08 16:17:46 2013 -0600
@@ -56,7 +56,7 @@
warning: conflicts during merge.
merging common incomplete! (edit conflicts, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
- [255]
+ [1]
Abort:
@@ -127,7 +127,7 @@
warning: conflicts during merge.
merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue)
- [255]
+ [1]
$ hg tglog
@ 4:draft 'C1'