--- a/tests/test-rebase-parameters.t Fri Feb 08 16:27:49 2013 -0600
+++ b/tests/test-rebase-parameters.t Fri Feb 08 16:17:46 2013 -0600
@@ -417,7 +417,7 @@
$ hg rebase -s 2 -d 1 --tool internal:fail
unresolved conflicts (see hg resolve, then hg rebase --continue)
- [255]
+ [1]
$ hg resolve -l
U c2