Mercurial > hg
comparison mercurial/crecord.py @ 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 | 25420df87903 |
children | c1d83d916e85 |
comparison
equal
deleted
inserted
replaced
41938:ad4a3e2eedb3 | 41939:7e95ade0f369 |
---|---|
1518 | 1518 |
1519 def reviewcommit(self): | 1519 def reviewcommit(self): |
1520 """ask for 'y' to be pressed to confirm selected. return True if | 1520 """ask for 'y' to be pressed to confirm selected. return True if |
1521 confirmed.""" | 1521 confirmed.""" |
1522 confirmtext = _( | 1522 confirmtext = _( |
1523 """if you answer yes to the following, the your currently chosen patch chunks | 1523 """If you answer yes to the following, your currently chosen patch chunks |
1524 will be loaded into an editor. you may modify the patch from the editor, and | 1524 will be loaded into an editor. To modify the patch, make the changes in your |
1525 save the changes if you wish to change the patch. otherwise, you can just | 1525 editor and save. To accept the current patch as-is, close the editor without |
1526 close the editor without saving to accept the current patch as-is. | 1526 saving. |
1527 | 1527 |
1528 note: don't add/remove lines unless you also modify the range information. | 1528 note: don't add/remove lines unless you also modify the range information. |
1529 failing to follow this rule will result in the commit aborting. | 1529 failing to follow this rule will result in the commit aborting. |
1530 | 1530 |
1531 are you sure you want to review/edit and confirm the selected changes [yn]? | 1531 are you sure you want to review/edit and confirm the selected changes [yn]? |