Subject: Re: merging problems with Linus' kernel tree.

From: Dave Jones <[email-masked]>
Date: Tue, 21 Feb 2006 15:29:35 -0500

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