Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/filemerge.py
changeset 27164 88d5db4b155c
parent 27163 27b89a0957ec
child 27599 ad5966de3c9a 
--- 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':
Mercurial