# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1454624093 0
# Node ID ade12bf2bf0e8f2b1f64f8de55af0c42118f9091
# Parent  d4247c306d82d6bfe22722c026f2c7675a0c33fa
rebase: mention help merge-tools in help

diff -r d4247c306d82 -r ade12bf2bf0e hgext/rebase.py
--- 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.