Submitter | timeless@mozdev.org |
---|---|
Date | Feb. 5, 2016, 2:09 a.m. |
Message ID | <8f7715647fb5acbda814.1454638182@waste.org> |
Download | mbox | patch |
Permalink | /patch/12994/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -155,6 +155,9 @@ a named branch with two heads. You will need to explicitly specify source and/or destination. + If you need to use a tool to automate merge/conflict decisions, you + can specify one with ``--tool``, see :hg:`help merge-tools`. + If a rebase is interrupted to manually resolve a conflict, it can be continued with --continue/-c or aborted with --abort/-a.