# [PATCH] Documentation: fix formatting error in merge-options.txt 2 messages from 2011-12-05 to 2011-12-05. Participants: Jack Nagel, Junio C Hamano. Thread: https://gitlist.dev/t/29087 ## Jack Nagel, 2011-12-05 07:53 Subject: [PATCH] Documentation: fix formatting error in merge-options.txt Message-ID: <1323071607-29213-1-git-send-email-jacknagel@gmail.com> URL: https://gitlist.dev/e/1323071607-29213-1-git-send-email-jacknagel%40gmail.com ``` 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 --- 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 ``` ## Junio C Hamano, 2011-12-05 19:16 Subject: Re: [PATCH] Documentation: fix formatting error in merge-options.txt Message-ID: <7v4nxen81f.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v4nxen81f.fsf%40alter.siamese.dyndns.org In-Reply-To: <1323071607-29213-1-git-send-email-jacknagel@gmail.com> ``` Jack Nagel writes: > 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. Thanks. > > Signed-off-by: Jack Nagel > --- > 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. ```