--- a/mercurial/help/config.txt Sat Oct 14 15:42:38 2017 -0400
+++ b/mercurial/help/config.txt Sat Oct 14 03:13:50 2017 -0400
@@ -442,6 +442,18 @@
Make paths in :hg:`status` output relative to the current directory.
(default: False)
+``update.check``
+ Determines what level of checking :hg:`update` will perform before moving
+ to a destination revision. Valid values are ``abort``, ``none``,
+ ``linear``, and ``noconflict``. ``abort`` always fails if the working
+ directory has uncommitted changes. ``none`` performs no checking, and may
+ result in a merge with uncommitted changes. ``linear`` allows any update
+ as long as it follows a straight line in the revision history, and may
+ trigger a merge with uncommitted changes. ``noconflict`` will allow any
+ update which would not trigger a merge with uncommitted changes, if any
+ are present.
+ (default: ``linear``)
+
``update.requiredest``
Require that the user pass a destination when running :hg:`update`.
For example, :hg:`update .::` will be allowed, but a plain :hg:`update`