Documentation: fix formatting error in merge-options.txt
The first paragraph inside of a list item does not need a preceding line consisting of a single '+', and in fact this causes the text to be misrendered. Fix it. Signed-off-by: Jack Nagel <jacknagel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jack Nagel committed
Dec 5, 2011 at 01:53 UTC
aad2a07cfcdc89fd63bf28a2ac2873712fb25e43
1 file changed
-1
Documentation/merge-options.txt
-1
@@ -9,7 +9,6 @@ inspect and further tweak the merge result before committing.
9
10
--edit::
11
-e::
12
-+
12
Invoke editor before committing successful merge to further
13
edit the default merge message.
14