From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 05 Dec 2011 19:16:28 GMT
Subject: Re: [PATCH] Documentation: fix formatting error in merge-options.txt
Message-ID: <7v4nxen81f.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1323071607-29213-1-git-send-email-jacknagel@gmail.com>

Jack Nagel <jacknagel@gmail.com> 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 <jacknagel@gmail.com>
> ---
>  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.