From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 25 May 2009 07:52:05 GMT
Subject: Re: [PATCH 1/2] merge-file fails to output anything for a degenerate merge
Message-ID: <alpine.DEB.1.00.0905250951120.26154@pacific.mpi-cbg.de>
In-Reply-To: <1243210874-18451-2-git-send-email-charles@hashpling.org>

Hi,

On Mon, 25 May 2009, Charles Bailey wrote:

> In the case that merge-file is passed three files with identical
> contents it wipes the contents of the output file instead of
> leaving it unchanged.
> 
> Althought merge-file is porcelain and this will never happen in
> normal usage, it is still wrong.
> 
> Signed-off-by: Charles Bailey <charles@hashpling.org>

Your patch is good, but I'd like to have it mention in the commit subject 
that this is not a fix, but a patch to the test suite.  A prefix "t6023:" 
would suffice, methinks.

Thanks,
Dscho