From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 06 May 2010 19:13:03 GMT
Subject: Re: Problem with git merge/rebase with conflicts
Message-ID: <7v8w7wj134.fsf@alter.siamese.dyndns.org>
In-Reply-To: <19426.38028.501924.921359@winooski.ccs.neu.edu>

Eli Barzilay <eli@barzilay.org> writes:

> 1. I get this:
> 3. Again, starting from the same setup:

I don't have time to look at the second one, but these are quite obvious
and natural.  "status" in these cases notices that you haven't made any
change relative to HEAD (in either the index nor in the working tree)
after all, and that is what is being reported.