Re: bogus merges

On Sun, Sep 11, 2005 at 11:48:10PM +1200, Martin Langhoff wrote:

On 9/11/05, Russell King [off-list ref] wrote:

quoted

On Mon, Sep 05, 2005 at 09:01:32AM -0700, Linus Torvalds wrote:

quoted

I suspect rmk is using cogito-0.13

Correct, and rmk will probably be extremely nervous about upgrading when
0.14 appears.

Well, *actually* cogito-0.13 didn't include git-core, so we have to
look for the reasons elsewhere. Could be the leftover MERGE_HEAD
Daniel mentions.

Russel, can you confirm what git-core version you are/were running?

Nope, because now that I look I'm actually using cogito 0.12.1
not 0.13 as I previously mentioned.  Oops.

-- 
Russell King