From: Charles Bailey <charles@hashpling.org>
Date: Mon, 25 May 2009 00:21:12 GMT
Subject: Slightly obscure merge-file inconsistency
Message-ID: <1243210874-18451-1-git-send-email-charles@hashpling.org>

This was spotted by someone on stackoverflow.com.

It seems that git merge-file will wipe the merged file in the
degenerate case when all the inputs have identical contents. As
far as I can tell this is a bug, albeit one which will never be
triggered in practice because merge-file won't ever be called on
files that are identical in base, local and remote versions.

I think that the problem is just an overzealous null check in
xdl_merge. Certainly with the fix, the test suite still passes but
there may be some use cases of xdl_merge that I'm not aware of
that rely on the current behaviour.

http://stackoverflow.com/questions/903966/