From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 20 Apr 2009 03:19:16 GMT
Subject: Re: correct git merge behavior or corner case?
Message-ID: <20090420031916.GV23604@spearce.org>
In-Reply-To: <4ac8254d0904191540j68246cd8qa36a034209d4c800@mail.gmail.com>

Tuncer Ayaz <tuncer.ayaz@gmail.com> wrote:
> I have stumbled upon the following blog post via one of
> the news aggegrators and wondered whether the behavior
> is correct and expected or he's expecting something wrong
> or doing something wrong.
> 
> I cannot see a wrong usage pattern from what he has written.
> 
> http://blog.teksol.info/2009/04/15/beware-of-gits-content-tracking.html
> 
> as the author hasn't posted here after a couple of days
> I decided to take his question here for at least understanding
> what behavior he is experiencing.

Well, the author of the blog post gave us *no* information about
what he did, or what he expected.  He's just showing us a diff,
which we're not even sure how he created, and then complaining
about Git not doing something he wanted.

-- 
Shawn.