From: C. Scott Ananian <cscott@cscott.net>
Date: Fri, 15 Apr 2005 16:30:05 GMT
Subject: Re: Merge with git-pasky II.
Message-ID: <Pine.LNX.4.61.0504151227590.27637@cag.csail.mit.edu>
In-Reply-To: <20050415085424.5f61b80b.pj@engr.sgi.com>

On Fri, 15 Apr 2005, Paul Jackson wrote:

> Um ah ... could you explain what you mean by inter and intra file diffs?

intra file diffs: here are two versions of the same file.  what changed? 
inter file diffs: here is a new file, and here are *all the files in the 
current committed version*.  Where did the contents of this new file come 
from?  (Note that the new file is often a slightly changed version of an 
existing file in the current committed version.  But we don't assume that 
must be true.)
  --scott

supercomputer Pakistan WSHOOFS SECANT LCPANGS SDI assassination ZPSECANT 
SEQUIN AEBARMAN ESCOBILLA bomb mustard STANDEL ESGAIN Nazi FJDEFLECT
                          ( http://cscott.net/ )