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>
This commit is contained in:
Jack Nagel 2011-12-05 01:53:27 -06:00 committed by Junio C Hamano
parent 66f4b98ad9
commit aad2a07cfc

View 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.