From: Jeff King <peff@peff.net>
Date: Thu, 22 Mar 2012 14:01:40 GMT
Subject: Re: Strange effect merging empty file
Message-ID: <20120322140140.GA8803@sigill.intra.peff.net>
In-Reply-To: <4F6B1F48.3040007@in.waw.pl>

On Thu, Mar 22, 2012 at 01:47:04PM +0100, Zbigniew Jędrzejewski-Szmek wrote:

> Yes, this will indeed fix this particular problem. But in general,
> empty files can be used for various reasons, and it can be a pretty
> nasty surprise if they sprout random content as a result of a merge.
> 
> Maybe merge-recursive could special-case empty files?

I was thinking the same thing. And it seems this came up once before,
and the list seemed to favor special-casing merge-recursive (but not
diffcore):

  http://thread.gmane.org/gmane.comp.version-control.git/116917/focus=117082

-Peff