Merge branch 'js/objc-funchdr'

diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 00277e061313974a4f8fdb9333608902c7ef653f..c735788b0f1c8efb0b250d4810be420be6c62f89 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -1,5 +1,5 @@
 merge.stat::
-       Whether to print the diffstat between ORIG_HEAD and merge result
+       Whether to print the diffstat between ORIG_HEAD and the merge result
        at the end of the merge.  True by default.
 
 merge.log::