DORMANTno replies

[PATCH] Documentation: fix formatting error in merge-options.txt

From: Jack Nagel <hidden>
Date: 2016-06-15 22:52:33
Subsystem: documentation, the rest · Maintainers: Jonathan Corbet, Linus Torvalds

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 <redacted>
---
 Documentation/merge-options.txt |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 6bd0b04..1a5c12e 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.
 
-- 
1.7.8
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help