From: Linus Torvalds <torvalds@osdl.org>
Date: Thu, 02 Feb 2006 07:55:52 GMT
Subject: Re: The merge from hell...
Message-ID: <Pine.LNX.4.64.0602012353130.21884@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0602012334360.21884@g5.osdl.org>



On Wed, 1 Feb 2006, Linus Torvalds wrote:
> 
> Not under my suggested "two version" rule.

That "Not" is just me being stupid. I'm agreeing with you, not 
disagreeing, I just misread your mail.

I _think_ your version of the rule ("pluses and minuses in all the same 
columns") ends up being exactly the same as my rule ("only two different 
versions").

		Linus