Mercurial > hg
changeset 28001:ade12bf2bf0e
rebase: mention help merge-tools in help
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 04 Feb 2016 22:14:53 +0000 |
| parents | d4247c306d82 |
| children | e862b1fd33a8 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Feb 05 13:23:24 2016 -0800 +++ b/hgext/rebase.py Thu Feb 04 22:14:53 2016 +0000 @@ -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.