Fix a formatting error in git-merge.txt
Inside an element of an enumerated list, the second and subsequent paragraphs need to lose their indent and have to be strung together with a line with a single '+' on it instead. Otherwise the lines below are shown in typewriter face, which just looks wrong. Signed-off-by: Nathan W. Panike <nathan.panike@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nathan W. Panike committed
Oct 29, 2010 at 10:33 UTC
af77aee9cac51c2036e6019b4aebec2049f03e6b
1 file changed
+7
-7
Documentation/git-merge.txt
+7
-7
@@ -59,13 +59,13 @@ include::merge-options.txt[]
59
-m <msg>::
60
Set the commit message to be used for the merge commit (in
61
case one is created).
62
-
63
- If `--log` is specified, a shortlog of the commits being merged
64
- will be appended to the specified message.
65
-
66
- The 'git fmt-merge-msg' command can be
67
- used to give a good default for automated 'git merge'
68
- invocations.
62
++
63
+If `--log` is specified, a shortlog of the commits being merged
64
+will be appended to the specified message.
65
++
66
+The 'git fmt-merge-msg' command can be
67
+used to give a good default for automated 'git merge'
68
+invocations.
69
70
--rerere-autoupdate::
71
--no-rerere-autoupdate::