From: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri, 29 Oct 2010 15:57:43 GMT
Subject: Re: [PATCH] Fix a formatting error in git-merge.txt
Message-ID: <20101029155743.GA28839@burratino>
In-Reply-To: <4ccaebae.e91dec0a.1ac5.ffff8876@mx.google.com>

(+cc: Ram, Junio)

Hi,

Nathan W. Panike wrote:

> Signed-off-by: Nathan W. Panike <nathan.panike@gmail.com>
> ---
> Without this patch, the lines below get set in typewriter mode, which
> just looks wrong.

This part belongs above the "---" line, so future generations can
learn the reason for the patch (and thus avoid undoing it when
considering future changes).

>  Documentation/git-merge.txt |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)

Thanks.  The patch proper looks good to me.

Regards,
Jonathan