--- a/tests/test-rebase-conflicts.t	Wed Aug 08 21:38:53 2012 +0200
+++ b/tests/test-rebase-conflicts.t	Wed Aug 08 18:10:16 2012 +0200
@@ -69,7 +69,7 @@
 
 Try to continue without solving the conflict:
 
-  $ hg rebase --continue 
+  $ hg rebase --continue
   abort: unresolved merge conflicts (see hg help resolve)
   [255]