--- a/mercurial/patch.py Tue Mar 12 14:58:35 2019 -0700
+++ b/mercurial/patch.py Tue Mar 12 14:17:41 2019 -0700
@@ -1012,11 +1012,13 @@
'multiple': {
'apply': _("apply change %d/%d to '%s'?"),
'discard': _("discard change %d/%d to '%s'?"),
+ 'keep': _("keep change %d/%d to '%s'?"),
'record': _("record change %d/%d to '%s'?"),
},
'single': {
'apply': _("apply this change to '%s'?"),
'discard': _("discard this change to '%s'?"),
+ 'keep': _("keep this change to '%s'?"),
'record': _("record this change to '%s'?"),
},
'help': {
@@ -1040,6 +1042,16 @@
'$$ Discard &all changes to all remaining files'
'$$ &Quit, discarding no changes'
'$$ &? (display help)'),
+ 'keep': _('[Ynesfdaq?]'
+ '$$ &Yes, keep this change'
+ '$$ &No, skip this change'
+ '$$ &Edit this change manually'
+ '$$ &Skip remaining changes to this file'
+ '$$ Keep remaining changes to this &file'
+ '$$ &Done, skip remaining changes and files'
+ '$$ Keep &all changes to all remaining files'
+ '$$ &Quit, keeping all changes'
+ '$$ &? (display help)'),
'record': _('[Ynesfdaq?]'
'$$ &Yes, record this change'
'$$ &No, skip this change'