From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 17 Jan 2009 15:16:01 GMT
Subject: Re: Possible git bug
Message-ID: <alpine.DEB.1.00.0901171613540.3586@pacific.mpi-cbg.de>
In-Reply-To: <87zlhqca4m.fsf@inbox.ru>

Hi,

On Sat, 17 Jan 2009, Damon LaCrosse wrote:

> any chances the attached patch reveals a git bug?

You mean that it produces a merge conflict when a file was modified in one 
branch, and deleted in the other?

Because that's what you did, basically.  You did not rename file1 to 
file2.  You completely changed the contents.  I mean, completely.

Ciao,
Dscho