# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1441907100 14400
# Node ID e257df7a99746167cc8460c3ec6f02db27085584
# Parent  a4da463df6cf0d0bcf36afa478ed18d1c818ff3e
help/config: back out 5f2a1ebd6e78

This breaks building manpages, and by association breaks building
debs. timeless has a fix coming, but it turns out we'll need to back
out 5f2a1ebd6e78 anyway, so just back it out now to fix building
packages.

diff -r a4da463df6cf -r e257df7a9974 mercurial/help/config.txt
--- a/mercurial/help/config.txt	Thu Sep 10 09:41:11 2015 -0400
+++ b/mercurial/help/config.txt	Thu Sep 10 13:45:00 2015 -0400
@@ -1037,7 +1037,7 @@
   This tool can merge symlinks. (default: False)
 
 ``check``
-  A list of merge success-checking options::
+  A list of merge success-checking options:
 
   ``changed``
     Ask whether merge was successful when the merged file shows no changes.