##// END OF EJS Templates
rebase: mention help merge-tools in help
timeless -
r28001:ade12bf2 default
parent child Browse files
Show More
@@ -155,6 +155,9 def rebase(ui, repo, **opts):
155 a named branch with two heads. You will need to explicitly specify source
155 a named branch with two heads. You will need to explicitly specify source
156 and/or destination.
156 and/or destination.
157
157
158 If you need to use a tool to automate merge/conflict decisions, you
159 can specify one with ``--tool``, see :hg:`help merge-tools`.
160
158 If a rebase is interrupted to manually resolve a conflict, it can be
161 If a rebase is interrupted to manually resolve a conflict, it can be
159 continued with --continue/-c or aborted with --abort/-a.
162 continued with --continue/-c or aborted with --abort/-a.
160
163
General Comments 0
You need to be logged in to leave comments. Login now