Mercurial Mercurial > mercurial / 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 8259 98acfd1d2b08
parent 8225 46293a0c7e9f
child 8269 bb9f13974d8e 
--- a/mercurial/filemerge.py	Fri Apr 24 14:40:56 2009 -0700
+++ b/mercurial/filemerge.py	Thu Apr 30 10:15:32 2009 -0500
@@ -143,7 +143,7 @@
         tool = "internal:local"
         if ui.prompt(_(" no tool found to merge %s\n"
                        "keep (l)ocal or take (o)ther?") % fd,
-                     _("[lo]"), _("l")) != _("l"):
+                     (_("&Local"), _("&Other")), _("l")) != _("l"):
             tool = "internal:other"
     if tool == "internal:local":
         return 0
@@ -205,7 +205,7 @@
         if filecmp.cmp(repo.wjoin(fd), back):
             if ui.prompt(_(" output file %s appears unchanged\n"
                 "was merge successful (yn)?") % fd,
-                _("[yn]"), _("n")) != _("y"):
+                (_("&Yes"), _("&No")), _("n")) != _("y"):
                 r = 1
 
     if _toolbool(ui, tool, "fixeol"):
mercurial