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@xxxxxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html