# HG changeset patch # User timeless # Date 2016-02-04 23:29:32 # Node ID e862b1fd33a820473598e2c9eafb89deb34b7d5c # Parent ade12bf2bf0e8f2b1f64f8de55af0c42118f9091 rebase: document that tool does not apply to deleted files diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -157,6 +157,8 @@ def rebase(ui, repo, **opts): If you need to use a tool to automate merge/conflict decisions, you can specify one with ``--tool``, see :hg:`help merge-tools`. + As a caveat: the tool will not be used to mediate when a file was + 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.