Documentation: fix formatting error in merge-options.txt
authorJack Nagel <jacknagel@gmail.com>
Mon, 5 Dec 2011 07:53:27 +0000 (01:53 -0600)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 19:15:45 +0000 (11:15 -0800)
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>
Documentation/merge-options.txt
index 6bd0b041c3c1c0af5d03fce43d8016706e9256b1..1a5c12e3171ab82f489bcd53657c8a89741a3dab 100644 (file)
@@ -9,7 +9,6 @@ inspect and further tweak the merge result before committing.
 
 --edit::
 -e::
-+
        Invoke editor before committing successful merge to further
        edit the default merge message.