diff mercurial/filemerge.py @ 29786:978b907d9b36

merge: always use other, not remote, in user prompts

Now that we store and display merge labels in user prompts (not just
conflict markets), we should rely on labels to clarify the two sides of a
merge operation (hg merge, hg update, hg rebase etc).

"remote" is not a great name here, as it conflates "remote" as in "remote
server" with "remote" as in "the side of the merge that's further away". In
cases where you're merging the "wrong way" around, remote can even be the
"local" commit that you're merging with something pulled from the remote
server.

--- 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)