From: Paul Jackson Date: Fri, 15 Apr 2005 18:29:27 GMT Subject: Re: Merge with git-pasky II. Message-ID: <20050415112927.72a7004f.pj@engr.sgi.com> In-Reply-To: > intra file diffs: here are two versions of the same file. Ah so. Linus faked me out. I was _sure_ that by "file" he meant "file" -- as in a bucket of bits with a unique identifying . In that message, I guess by "file" he meant "a version controlled file, consisting of a series of content versions and meta-data" That's what I get for trusting Linus to always speak as a kernel hacker, not an SCM hacker. -- I won't rest till it's the best ... Programmer, Linux Scalability Paul Jackson 1.650.933.1373, 1.925.600.0401