Mercurial > public > mercurial-scm > hg
comparison mercurial/filemerge.py @ 39277: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 |
comparison
equal
deleted
inserted
replaced
| 39276:337443f09fc8 | 39277:f785073f792c |
|---|---|
| 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 "local%(l)s changed %(fd)s which other%(o)s deleted\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 "use (c)hanged version, (d)elete, or leave (u)nresolved?" | 61 "use (c)hanged version, (d)elete, or leave (u)nresolved?" |
| 61 "$$ &Changed $$ &Delete $$ &Unresolved") | 62 "$$ &Changed $$ &Delete $$ &Unresolved") |
| 62 | 63 |
| 63 _otherchangedlocaldeletedmsg = _( | 64 _otherchangedlocaldeletedmsg = _( |
| 64 "other%(o)s changed %(fd)s which local%(l)s deleted\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" | |
| 65 "use (c)hanged version, leave (d)eleted, or " | 67 "use (c)hanged version, leave (d)eleted, or " |
| 66 "leave (u)nresolved?" | 68 "leave (u)nresolved?" |
| 67 "$$ &Changed $$ &Deleted $$ &Unresolved") | 69 "$$ &Changed $$ &Deleted $$ &Unresolved") |
| 68 | 70 |
| 69 class absentfilectx(object): | 71 class absentfilectx(object): |