Mercurial > hg

diff mercurial/help/config.txt @ 18385:bafbfe0b450c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration These settings were replaced by check=changed and check=conflicts in a912f26777d3. There is no reason to announce two different ways to achieve the same. The old way should be kept but not announced.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 15 Jan 2013 23:30:10 +0100
parents 8243dd66e0e3
children 68eecbaf1bd3
line wrap: on
line diff
--- 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