# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1327695572 21600
# Node ID f1208827df7c381096bd75728afe283e5e02887d
# Parent  02a497a17257abd6e209d224af3318a40e0508d8
resolve: mention merge-tools topic in help

diff -r 02a497a17257 -r f1208827df7c mercurial/commands.py
--- a/mercurial/commands.py	Fri Jan 27 22:29:58 2012 +0900
+++ b/mercurial/commands.py	Fri Jan 27 14:19:32 2012 -0600
@@ -4603,7 +4603,8 @@
     setting, or a command-line merge tool like ``diff3``. The resolve
     command is used to manage the files involved in a merge, after
     :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
-    working directory must have two parents).
+    working directory must have two parents). See :hg:`help
+    merge-tools` for information on configuring merge tools.
 
     The resolve command can be used in the following ways: