Mercurial > public > mercurial-scm > hg
diff mercurial/filemerge.py @ 39285:a3fd84f4fb38
filemerge: fix the wrong placements of messages in prompt
Mistakenly, the local-changed-other-deleted-message was put in
other-change-local-deleted and vice versa. This followups on D4336.
Thanks to Yuya who spotted this.
Differential Revision: https://phab.mercurial-scm.org/D4375
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Sun, 26 Aug 2018 19:14:26 +0300 |
| parents | 975d959295ef |
| children | bc0eb1dc6aae |
line wrap: on
line diff
--- 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?"