Mercurial > public > mercurial-scm > hg
comparison mercurial/filemerge.py @ 39284: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 |
comparison
equal
deleted
inserted
replaced
| 39283:71575a1e197e | 39284:975d959295ef |
|---|---|
| 54 nomerge = internaltool.nomerge | 54 nomerge = internaltool.nomerge |
| 55 mergeonly = internaltool.mergeonly # just the full merge, no premerge | 55 mergeonly = internaltool.mergeonly # just the full merge, no premerge |
| 56 fullmerge = internaltool.fullmerge # both premerge and merge | 56 fullmerge = internaltool.fullmerge # both premerge and merge |
| 57 | 57 |
| 58 _localchangedotherdeletedmsg = _( | 58 _localchangedotherdeletedmsg = _( |
| 59 "file %(fd)s was deleted in local%(l)s but was modified in other%(o)s.\n" | 59 "file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n" |
| 60 "What do you want to do?\n" | 60 "What do you want to do?\n" |
| 61 "use (c)hanged version, (d)elete, or leave (u)nresolved?" | 61 "use (c)hanged version, (d)elete, or leave (u)nresolved?" |
| 62 "$$ &Changed $$ &Delete $$ &Unresolved") | 62 "$$ &Changed $$ &Delete $$ &Unresolved") |
| 63 | 63 |
| 64 _otherchangedlocaldeletedmsg = _( | 64 _otherchangedlocaldeletedmsg = _( |
| 65 "file %(fd)s was deleted in other%(o)s but was modified in local%(l)s.\n" | 65 "file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n" |
| 66 "What do you want to do?\n" | 66 "What do you want to do?\n" |
| 67 "use (c)hanged version, leave (d)eleted, or " | 67 "use (c)hanged version, leave (d)eleted, or " |
| 68 "leave (u)nresolved?" | 68 "leave (u)nresolved?" |
| 69 "$$ &Changed $$ &Deleted $$ &Unresolved") | 69 "$$ &Changed $$ &Deleted $$ &Unresolved") |
| 70 | 70 |