--- a/tests/test-subrepo.t	Thu Jan 24 23:57:44 2013 +0100
+++ b/tests/test-subrepo.t	Thu Jan 24 23:57:44 2013 +0100
@@ -244,7 +244,7 @@
    overwrite: False, partial: False
    ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
    t: versions differ -> m
-  preserving t for resolve of t
+    preserving t for resolve of t
   updating: t 1/1 files (100.00%)
   picked tool 'internal:merge' for t (binary False symlink False)
   merging t