Merge branch 'maint'

* maint:
  Fix a formatting error in git-merge.txt

Documentation/git-merge.txt

@@ -59,13 +59,13 @@ include::merge-options.txt[]
 -m <msg>::
 	Set the commit message to be used for the merge commit (in
 	case one is created).
-
++
-	If `--log` is specified, a shortlog of the commits being merged
+If `--log` is specified, a shortlog of the commits being merged
-	will be appended to the specified message.
+will be appended to the specified message.
-
++
-	The 'git fmt-merge-msg' command can be
+The 'git fmt-merge-msg' command can be
-	used to give a good default for automated 'git merge'
+used to give a good default for automated 'git merge'
-	invocations.
+invocations.
 
 --rerere-autoupdate::
 --no-rerere-autoupdate::