##// END OF EJS Templates
rebase: document that tool does not apply to deleted files
timeless -
r28002:e862b1fd default
parent child Browse files
Show More
@@ -157,6 +157,8 b' def rebase(ui, repo, **opts):'
157
157
158 If you need to use a tool to automate merge/conflict decisions, you
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`.
159 can specify one with ``--tool``, see :hg:`help merge-tools`.
160 As a caveat: the tool will not be used to mediate when a file was
161 deleted, there is no hook presently available for this.
160
162
161 If a rebase is interrupted to manually resolve a conflict, it can be
163 If a rebase is interrupted to manually resolve a conflict, it can be
162 continued with --continue/-c or aborted with --abort/-a.
164 continued with --continue/-c or aborted with --abort/-a.
General Comments 0
You need to be logged in to leave comments. Login now