[PATCH 1 of 4] rebase: mention help merge-tools in help
timeless
timeless at mozdev.org
Fri Feb 5 02:09:42 UTC 2016
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1454624093 0
# Thu Feb 04 22:14:53 2016 +0000
# Node ID 8f7715647fb5acbda814fc5fc2ba99d0dc4c4c07
# Parent 01a5143cd25f285f8c745a92986cd7186bb32c90
rebase: mention help merge-tools in help
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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.
More information about the Mercurial-devel
mailing list