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>
git-mirror · Dec 5, 2011 · aad2a07 · aad2a07
1 parent 66f4b98
commit aad2a07
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
@@ -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.