D3970: rebase: include --stop option in documentation
khanchi97 (Sushil khanchi)
phabricator at mercurial-scm.org
Tue Aug 14 20:48:10 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG571361e47137: rebase: include --stop option in documentation (authored by khanchi97, committed by ).
CHANGED PRIOR TO COMMIT
https://phab.mercurial-scm.org/D3970?vs=10288&id=10356#toc
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3970?vs=10288&id=10356
REVISION DETAIL
https://phab.mercurial-scm.org/D3970
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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
To: khanchi97, #hg-reviewers
Cc: yuja, mercurial-devel
More information about the Mercurial-devel
mailing list