From: Jack Nagel <jacknagel@gmail.com>
Date: Mon, 5 Dec 2011 07:53:27 +0000 (-0600)
Subject: Documentation: fix formatting error in merge-options.txt
X-Git-Tag: v1.7.8.1~18^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aad2a07cfcdc89fd63bf28a2ac2873712fb25e43;p=git.git

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

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 6bd0b041c..1a5c12e31 100644
--- 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.