Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 39304:f785073f792c
merge: improve interactive one-changed one-deleted message (issue5550)
I like the wording from the bug, so I figured I'd package it up in a
change and see what people think.
Differential Revision: https://phab.mercurial-scm.org/D4336
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 20 Aug 2018 13:29:48 -0400 |
| parents | 88c5a3ef54b1 |
| children | 975d959295ef |
line wrap: on
line diff
--- a/mercurial/filemerge.py Thu Aug 16 17:19:27 2018 +0200 +++ b/mercurial/filemerge.py Mon Aug 20 13:29:48 2018 -0400 @@ -56,12 +56,14 @@ fullmerge = internaltool.fullmerge # both premerge and merge _localchangedotherdeletedmsg = _( - "local%(l)s changed %(fd)s which other%(o)s deleted\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, (d)elete, or leave (u)nresolved?" "$$ &Changed $$ &Delete $$ &Unresolved") _otherchangedlocaldeletedmsg = _( - "other%(o)s changed %(fd)s which local%(l)s deleted\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, leave (d)eleted, or " "leave (u)nresolved?" "$$ &Changed $$ &Deleted $$ &Unresolved")