--- a/doc/hgrc.5.txt	Mon May 10 11:04:56 2010 -0500
+++ b/doc/hgrc.5.txt	Mon May 10 11:04:56 2010 -0500
@@ -470,6 +470,8 @@
     Ask whether merge was successful when the merged file shows no changes.
   ``conflicts``
     Check whether there are conflicts even though the tool reported success.
+  ``prompt``
+    Always prompt for merge success, regardless of success reported by tool.
 
 ``checkchanged``
   True is equivalent to ``check = changed``.