Patchwork D3970: rebase: include --stop option in documentation

login
register
mail settings
Submitter phabricator
Date July 24, 2018, 6:04 p.m.
Message ID <abf75f4fcc3035c16c6b842a20da5057@localhost.localdomain>
Download mbox | patch
Permalink /patch/32934/
State Not Applicable
Headers show

Comments

phabricator - July 24, 2018, 6:04 p.m.
khanchi97 updated this revision to Diff 9656.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3970?vs=9644&id=9656

REVISION DETAIL
  https://phab.mercurial-scm.org/D3970

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: khanchi97, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -747,7 +747,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 or aborted with --abort/-a or stopped
+    with --stop.
 
     .. container:: verbose