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/merge.py
changeset 29775 978b907d9b36
parent 29774 a7f8939641aa
child 29831 1316c7cccc76 
--- a/mercurial/merge.py	Fri Aug 12 06:01:42 2016 -0700
+++ b/mercurial/merge.py	Fri Aug 12 05:56:40 2016 -0700
@@ -1539,7 +1539,7 @@
             prompts['f'] = f
             if m == 'cd':
                 if repo.ui.promptchoice(
-                    _("local%(l)s changed %(f)s which remote%(o)s deleted\n"
+                    _("local%(l)s changed %(f)s which other%(o)s deleted\n"
                       "use (c)hanged version or (d)elete?"
                       "$$ &Changed $$ &Delete") % prompts, 0):
                     actionbyfile[f] = ('r', None, "prompt delete")
@@ -1551,7 +1551,7 @@
                 f1, f2, fa, move, anc = args
                 flags = p2[f2].flags()
                 if repo.ui.promptchoice(
-                    _("remote%(o)s changed %(f)s which local%(l)s deleted\n"
+                    _("other%(o)s changed %(f)s which local%(l)s deleted\n"
                       "use (c)hanged version or leave (d)eleted?"
                       "$$ &Changed $$ &Deleted") % prompts, 0) == 0:
                     actionbyfile[f] = ('g', (flags, False), "prompt recreating")
mercurial