--- a/mercurial/filemerge.py Sat Aug 25 21:17:34 2018 +0300
+++ b/mercurial/filemerge.py Sun Aug 26 19:14:26 2018 +0300
@@ -56,13 +56,13 @@
fullmerge = internaltool.fullmerge # both premerge and merge
_localchangedotherdeletedmsg = _(
- "file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n"
+ "file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n"
"What do you want to do?\n"
"use (c)hanged version, (d)elete, or leave (u)nresolved?"
"$$ &Changed $$ &Delete $$ &Unresolved")
_otherchangedlocaldeletedmsg = _(
- "file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n"
+ "file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n"
"What do you want to do?\n"
"use (c)hanged version, leave (d)eleted, or "
"leave (u)nresolved?"