From: Dave Jones <davej@redhat.com>
Date: Tue, 21 Feb 2006 20:29:35 GMT
Subject: Re: merging problems with Linus' kernel tree.
Message-ID: <20060221202935.GC24159@redhat.com>
In-Reply-To: <Pine.LNX.4.64.0602211153570.30245@g5.osdl.org>

On Tue, Feb 21, 2006 at 12:03:04PM -0800, Linus Torvalds wrote:

 > That, in turn, is usually due to an aborted merge.

Hmm.  (Recalls a power outage a few days ago).
I'll bet that's when it happened.

 > Do a "git checkout -f".

Fixed, thanks.

		Dave