# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 1288035289 18000
# Node ID 830be2c576262c81af39ac3113106d3a120d8cc4
# Parent  c82056f2509f1e86df3bc7c80581d1775fc6a4c5
help: improve wording of internal:merge and internal:fail

diff -r c82056f2509f -r 830be2c57626 mercurial/help/merge-tools.txt
--- a/mercurial/help/merge-tools.txt	Mon Oct 25 11:29:32 2010 -0500
+++ b/mercurial/help/merge-tools.txt	Mon Oct 25 14:34:49 2010 -0500
@@ -35,13 +35,14 @@
 merge tools are:
 
 ``internal:merge``
-   Uses the internal non-interactive simple merge algorithm for merging files.
-   It will fail if there are any conflicts.
+   Uses the internal non-interactive simple merge algorithm for merging
+   files. It will fail if there are any conflicts and leave markers in
+   the partially merged file.
 
 ``internal:fail``
    Rather than attempting to merge files that were modified on both
-   branches, it marks these files as unresolved. Then the resolve
-   command must be used to mark files resolved.
+   branches, it marks them as unresolved. The resolve command must be
+   used to resolve these conflicts.
 
 ``internal:local``
    Uses the local version of files as the merged version.