From: Alexander Litvinov <litvinov2004@gmail.com>
Date: Thu, 16 Nov 2006 12:23:38 GMT
Subject: Re: Git can't merge two identical move file operation
Message-ID: <200611161823.39056.litvinov2004@gmail.com>
In-Reply-To: <7v1wo3bp99.fsf@assigned-by-dhcp.cox.net>

В сообщении от Thursday 16 November 2006 17:32 Junio C Hamano написал(a):
> Could you try an exactly the same sequence except to make the
> initial contents of the file 'a' a bit more meaningful (I
> typically use COPYING file in git.git repository for something
> like this), by replacing the above "echo 1 > a ..." line with:
>
> 	$ cat COPYING >a && git add a && git commit -a -m '1'
>
> and see if it still breaks?  You do not need to change the later
> modification to the file (i.e. "echo 2 >>a"), but only the above
> single line change.

Wow, that a magic ! It works !

Thanks for help.