From: James Bottomley <james.bottomley@steeleye.com>
Date: Sun, 24 Apr 2005 05:03:01 GMT
Subject: Re: [PATCH] make file merging respect permissions
Message-ID: <1114318981.4980.14.camel@mulgrave>
In-Reply-To: <Pine.LNX.4.58.0504232153500.15879@ppc970.osdl.org>

On Sat, 2005-04-23 at 21:55 -0700, Linus Torvalds wrote:
> Well, I actually ended up editing the line numbers manually and already 
> pushed out the previous one, so you might want to double-check that my 
> current tree matches yours.

Yes, the sha1 of my changed file and the one you merged match, so
everything looks sane.

Sorry for the confusion,

James