diff -r 3951f132958f -r 6b639caa1652 mercurial/help/config.txt
--- a/mercurial/help/config.txt	Tue Jan 12 18:17:07 2016 -0800
+++ b/mercurial/help/config.txt	Tue Jan 12 18:38:49 2016 -0800
@@ -990,14 +990,20 @@
 
 This section specifies behavior during merges and updates.
 
-``checkunknown``
-   Controls behavior when an unknown file on disk has the same name as a tracked
+``checkignored``
+   Controls behavior when an ignored file on disk has the same name as a tracked
    file in the changeset being merged or updated to, and has different
    contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
    abort on such files. With ``warn``, warn on such files and back them up as
    .orig. With ``ignore``, don't print a warning and back them up as
    .orig. (default: ``abort``)
 
+``checkunknown``
+   Controls behavior when an unknown file that isn't ignored has the same name
+   as a tracked file in the changeset being merged or updated to, and has
+   different contents. Similar to ``merge.checkignored``, except for files that
+   are not ignored. (default: ``abort``)
+
 ``merge-patterns``
 ------------------