--- a/tests/test-rename-merge2.t	Mon Feb 04 02:46:38 2013 +0100
+++ b/tests/test-rename-merge2.t	Mon Feb 04 02:46:53 2013 +0100
@@ -617,7 +617,7 @@
   resolving manifests
    overwrite: False, partial: False
    ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
-   local changed a which remote deleted
+  local changed a which remote deleted
   use (c)hanged version or (d)elete? c
    a: prompt keep -> a
    b: versions differ -> m