From aad2a07cfcdc89fd63bf28a2ac2873712fb25e43 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 5 Dec 2011 01:53:27 -0600 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/merge-options.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'Documentation') 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. -- cgit v1.2.1