--- a/doc/hgrc.5.txt Wed Apr 21 12:02:51 2010 -0500
+++ b/doc/hgrc.5.txt Mon May 10 11:04:56 2010 -0500
@@ -463,13 +463,19 @@
``symlink``
This tool can merge symlinks. Defaults to False, even if tool was
selected by file pattern match.
-``checkconflicts``
- Check whether there are conflicts even though the tool reported
- success.
+``check``
+ A list of merge success-checking options:
+
+ ``changed``
+ Ask whether merge was successful when the merged file shows no changes.
+ ``conflicts``
+ Check whether there are conflicts even though the tool reported success.
+
+``checkchanged``
+ True is equivalent to ``check = changed``.
Default: False
-``checkchanged``
- Check whether outputs were written even though the tool reported
- success.
+``checkconflicts``
+ True is equivalent to ``check = conflicts``.
Default: False
``fixeol``
Attempt to fix up EOL changes caused by the merge tool.