X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge.txt;h=d43416d299a7c028a88e8ddce89536c2c64e65c9;hb=eeae6d754627343cfa9f1c72c5c00a3d949e9302;hp=84043cc5b26db7d34c93a70ec005df913c345d85;hpb=d25c72f7da5116f7b7a1f88a59d2bc14415a03b2;p=git.git

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 84043cc5b..d43416d29 100644
--- a/Documentation/git-merge.txt
+++ b/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
-	will be appended to the specified message.
-
-	The 'git fmt-merge-msg' command can be
-	used to give a good default for automated 'git merge'
-	invocations.
++
+If `--log` is specified, a shortlog of the commits being merged
+will be appended to the specified message.
++
+The 'git fmt-merge-msg' command can be
+used to give a good default for automated 'git merge'
+invocations.
 
 --rerere-autoupdate::
 --no-rerere-autoupdate::