From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Sep 2007 22:28:39 GMT
Subject: Re: Problem with merge when renaming
Message-ID: <7v7imnvca0.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <95b3d0af0709181334y1e21507ey485860e4d45aa26f@mail.gmail.com>

"David Euresti" <evelio@gmail.com> writes:

> I think I found a problem when you move a file into a directory of the
> same name.  Here's what I did.

Two questions.

 (1) git --version?

 (2) if you do "git merge -s resolve" instead of just "git
     merge", do you see a difference?