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 -- 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