diff -r 27b89a0957ec -r 88d5db4b155c mercurial/filemerge.py
--- a/mercurial/filemerge.py	Mon Nov 30 13:43:55 2015 -0800
+++ b/mercurial/filemerge.py	Tue Dec 01 09:48:38 2015 -0800
@@ -253,7 +253,7 @@
             index = ui.promptchoice(
                 _("no tool found to merge %s\n"
                   "keep (l)ocal, take (o)ther, or leave (u)nresolved?"
-                  "$$ &Local $$ &Other $$ &Unresolved") % fd, 0)
+                  "$$ &Local $$ &Other $$ &Unresolved") % fd, 2)
             choice = ['local', 'other', 'unresolved'][index]
 
         if choice == 'other':