--- a/mercurial/filemerge.py	Fri Aug 12 06:01:42 2016 -0700
+++ b/mercurial/filemerge.py	Fri Aug 12 05:56:40 2016 -0700
@@ -241,13 +241,13 @@
     try:
         if fco.isabsent():
             index = ui.promptchoice(
-                _("local%(l)s changed %(fd)s which remote%(o)s deleted\n"
+                _("local%(l)s changed %(fd)s which other%(o)s deleted\n"
                   "use (c)hanged version, (d)elete, or leave (u)nresolved?"
                   "$$ &Changed $$ &Delete $$ &Unresolved") % prompts, 2)
             choice = ['local', 'other', 'unresolved'][index]
         elif fcd.isabsent():
             index = ui.promptchoice(
-                _("remote%(o)s changed %(fd)s which local%(l)s deleted\n"
+                _("other%(o)s changed %(fd)s which local%(l)s deleted\n"
                   "use (c)hanged version, leave (d)eleted, or "
                   "leave (u)nresolved?"
                   "$$ &Changed $$ &Deleted $$ &Unresolved") % prompts, 2)