--- a/tests/test-obsolete.t	Wed Sep 19 14:53:24 2012 +0200
+++ b/tests/test-obsolete.t	Wed Sep 19 17:30:07 2012 +0200
@@ -498,6 +498,7 @@
   nothing to rebase
   [1]
   $ hg rebase -b 3 -d 4 --traceback
+  2 new conflicting changesets
   $ hg log -G -r 'not extinct()'  --template='{rev} - {node|short}\n'
   @  11 - 9468a5f5d8b2
   |