Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 39311:975d959295ef
filemerge: print the filename in quotes in prompt
This is better as the filename is in quotes and user can understand better what
the filename is and what is important part in the prompt.
Differential Revision: https://phab.mercurial-scm.org/D4373
| author | Pulkit Goyal <pulkit@yandex-team.ru> |
|---|---|
| date | Sat, 25 Aug 2018 21:17:34 +0300 |
| parents | f785073f792c |
| children | a3fd84f4fb38 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Tue Aug 14 17:00:32 2018 +0000 +++ b/mercurial/filemerge.py Sat Aug 25 21:17:34 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 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 = _( - "file %(fd)s was deleted in other%(o)s but was modified in local%(l)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, leave (d)eleted, or " "leave (u)nresolved?"