Mercurial > hg-stable
changeset 39132:571361e47137
rebase: include --stop option in documentation
Differential Revision: https://phab.mercurial-scm.org/D3970
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sun, 22 Jul 2018 22:08:14 +0530 |
parents | 2cf0b8b830ba |
children | 33f5cffe725f |
files | hgext/rebase.py |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Sun Jul 22 22:04:49 2018 +0530 +++ b/hgext/rebase.py Sun Jul 22 22:08:14 2018 +0530 @@ -733,7 +733,8 @@ deleted, there is no hook presently available for this. If a rebase is interrupted to manually resolve a conflict, it can be - continued with --continue/-c or aborted with --abort/-a. + continued with --continue/-c, aborted with --abort/-a, or stopped with + --stop. .. container:: verbose