[PATCH] resolve: updated help with info about merge tools

[Erik Zielke]

# HG changeset patch
# User Erik Zielke <ez at aragost.com>
# Date 1287141262 -7200
# Node ID 66b3736fc045c157552d35ac32ee223953c2fb4d
# Parent  4bca87c29445a6fb67aebe7eaed3f89c171cae41
resolve: updated help with info about merge tools.

Updated command help for resolve to include information about how to
set merge tool.

Updated help for configuration file with a slightly more verbose
description of the internal merge tools.

diff -r 4bca87c29445 -r 66b3736fc045 doc/hgrc.5.txt
--- a/doc/hgrc.5.txt	Thu Oct 14 22:53:17 2010 +0200
+++ b/doc/hgrc.5.txt	Fri Oct 15 13:14:22 2010 +0200
@@ -858,14 +858,24 @@
     The conflict resolution program to use during a manual merge.
     There are some internal tools available:
 
+    ``internal:merge``
+        Uses the internal non-interactive merge tool for
+        merging files.
+    ``internal:fail``
+        Makes the merge fail no matter if the merge is trvial to do.
     ``internal:local``
-        keep the local version
+        Uses the local version of files as the merged version.
     ``internal:other``
-        use the other version
-    ``internal:merge``
-        use the internal non-interactive merge tool
-    ``internal:fail``
-        fail to merge
+        Uses the remote version of files as the merged version.
+    ``internal:prompt``
+        Prompts the user if the local or the other version
+        of the files which should be used.
+    ``internal:dump``
+        Creates three versions of the files to merge, containg the contents
+        of local, other and base. These files can then be used for manually
+        merging. If the file merged is name a.txt, these files will accordingly
+        be named a.txt.local, a.txt.other and a.txt.base and they will be
+        placed in the same directory as the file to merge.
 
 For more information on configuring merge tools see the
 merge-tools_ section.
diff -r 4bca87c29445 -r 66b3736fc045 mercurial/commands.py
--- a/mercurial/commands.py	Thu Oct 14 22:53:17 2010 +0200
+++ b/mercurial/commands.py	Fri Oct 15 13:14:22 2010 +0200
@@ -2951,6 +2951,13 @@
     merge conflicts. You must use :hg:`resolve -m ...` before you can
     commit after a conflicting merge.
 
+    It is possible to use different merge tools, either internal
+    or external. The internal tools are ``internal:merge``, ``internal:fail``,
+    ``internal:local``, ``internal:other``, ``internal:dump``, and
+    ``internal:dump``, and can be set by the configuring the ui.merge
+    configuration setting. See :hg:`config` and the hgrc(5) man page for more
+    information on how to set configuration values.
+
     Returns 0 on success, 1 if any files fail a resolve attempt.
     """