From: Linus Torvalds <torvalds@osdl.org>
Date: Wed, 24 Aug 2005 05:58:34 GMT
Subject: Re: baffled again
Message-ID: <Pine.LNX.4.58.0508232258170.3317@g5.osdl.org>
In-Reply-To: <12c511ca050823223333c41857@mail.gmail.com>



On Tue, 23 Aug 2005, Tony Luck wrote:
> 
> So GIT decides that the test branch has had a patch, and the release
> branch hasn't ... and so it merges by keeping the version in test.
> 
> Plausible?

Very. Sounds like what happened.

		Linus