Mercurial > hg

changeset 28002:e862b1fd33a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: document that tool does not apply to deleted files
author timeless <timeless@mozdev.org>
date Thu, 04 Feb 2016 23:29:32 +0000
parents ade12bf2bf0e
children a1d4ca0c8483
files hgext/rebase.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Thu Feb 04 22:14:53 2016 +0000
+++ b/hgext/rebase.py	Thu Feb 04 23:29:32 2016 +0000
@@ -157,6 +157,8 @@
 
     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.