Merge branch 'sg/merge-summary-config'

Doc updates.

* sg/merge-summary-config:
Documentation: include 'merge.branchdesc' for merge and config as well

diff --combined Documentation/merge-config.txt
index 8a0e52f8ee64564ba1dcac63fc91cdef075996a7,a1756efcad72ac978063fee2837cd64deed08ed3..002ca58c21e2f653ffd5651a8aedfe865400e166
--- 1/Documentation/merge-config.txt
--- 2/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@@ -1,4 -1,4 +1,4 @@@
 -merge.conflictstyle::
 +merge.conflictStyle::
        Specify the style in which conflicted hunks are written out to
        working tree files upon merge.  The default is "merge", which
        shows a `<<<<<<<` conflict marker, changes made by one side,
@@@ -26,11 -26,7 +26,7 @@@ merge.ff:
        allowed (equivalent to giving the `--ff-only` option from the
        command line).
  
- merge.log::
-       In addition to branch names, populate the log message with at
-       most the specified number of one-line descriptions from the
-       actual commits that are being merged.  Defaults to false, and
-       true is a synonym for 20.
+ include::fmt-merge-msg-config.txt[]
  
  merge.renameLimit::
        The number of files to consider when performing rename detection