diff -r 51fa43a3cd58 -r 7a8e9a985c3b tests/test-merge-types.t
--- a/tests/test-merge-types.t	Mon Nov 09 22:31:01 2015 +0900
+++ b/tests/test-merge-types.t	Wed Nov 11 10:19:11 2015 -0800
@@ -171,7 +171,7 @@
    a: versions differ -> m (premerge)
   (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
   picked tool ':prompt' for a (binary False symlink True)
-   no tool found to merge a
+  no tool found to merge a
   keep (l)ocal or take (o)ther? l
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   $ hg diff --git