From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 21 Apr 2009 08:56:27 GMT
Subject: Re: correct git merge behavior or corner case?
Message-ID: <alpine.DEB.1.00.0904211055160.10279@pacific.mpi-cbg.de>
In-Reply-To: <fabb9a1e0904210148w4c6b869l396122baef1c0ee3@mail.gmail.com>

Hi,

On Tue, 21 Apr 2009, Sverre Rabbelier wrote:

> On Tue, Apr 21, 2009 at 05:09, Junio C Hamano <gitster@pobox.com> wrote:
> > and sane projects would not have an empty file tracked anyway, so...
> 
> Except python projects that are full of empty __init__.py files.... no?

But they would be a good example why we do _not_ want rename detection 
there.

I actually agree with Junio, though, that we want this special handling of 
empty files only in merge-recursive.

Ciao,
Dscho