diff -r 51fa43a3cd58 -r 7a8e9a985c3b mercurial/filemerge.py
--- a/mercurial/filemerge.py	Mon Nov 09 22:31:01 2015 +0900
+++ b/mercurial/filemerge.py	Wed Nov 11 10:19:11 2015 -0800
@@ -177,7 +177,7 @@
     fd = fcd.path()
 
     try:
-        index = ui.promptchoice(_(" no tool found to merge %s\n"
+        index = ui.promptchoice(_("no tool found to merge %s\n"
                                   "keep (l)ocal or take (o)ther?"
                                   "$$ &Local $$ &Other") % fd, 0)
         choice = ['local', 'other'][index]