Mercurial > hg
changeset 41939:7e95ade0f369
chunkselector: fix typos in instructions when user reviews patch
Differential Revision: https://phab.mercurial-scm.org/D6121
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Thu, 27 Dec 2018 13:36:17 -0800 |
| parents | ad4a3e2eedb3 |
| children | 70d2d47314e5 |
| files | mercurial/crecord.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/crecord.py Mon Mar 11 14:04:48 2019 -0700 +++ b/mercurial/crecord.py Thu Dec 27 13:36:17 2018 -0800 @@ -1520,10 +1520,10 @@ """ask for 'y' to be pressed to confirm selected. return True if confirmed.""" confirmtext = _( -"""if you answer yes to the following, the your currently chosen patch chunks -will be loaded into an editor. you may modify the patch from the editor, and -save the changes if you wish to change the patch. otherwise, you can just -close the editor without saving to accept the current patch as-is. +"""If you answer yes to the following, your currently chosen patch chunks +will be loaded into an editor. To modify the patch, make the changes in your +editor and save. To accept the current patch as-is, close the editor without +saving. note: don't add/remove lines unless you also modify the range information. failing to follow this rule will result in the commit aborting.