mercurial/help/config.txt

--- a/mercurial/help/config.txt	Tue Jan 15 23:30:10 2013 +0100
+++ b/mercurial/help/config.txt	Tue Jan 15 23:30:10 2013 +0100
@@ -850,14 +850,6 @@
   ``prompt``
     Always prompt for merge success, regardless of success reported by tool.
 
-``checkchanged``
-  True is equivalent to ``check = changed``.
-  Default: False
-
-``checkconflicts``
-  True is equivalent to ``check = conflicts``.
-  Default: False
-
 ``fixeol``
   Attempt to fix up EOL changes caused by the merge tool.
   Default: False