On Sat, Jan 11, 2003 at 07:05:36AM +0800, William Kenworthy wrote:
> diffs from what?  what happens if the user has made changes outside of
> the way gentoo has configured the system?  I found this was a major
> disavantage of Mandrake, as it had to assume that the user didnt fiddle
> with the files - if you configured it manually for whatever reason, the
> whole mandrake configuration system ended up broken.

man diff3  =)

diff3 generates a merge diff for three versions of a file - the original,
an updated file, and a second updated file (ie, made by a sysadmin), and a
second version of an updated file (ie, made by Gentoo..)

RCS and CVS depend heavily on this for conflict resolution.

-- 
Joseph Carter <knghtbrd@efn.org>                          Here we go again
 
<_Anarchy_> acf: maybe April 1 next year slashdot needs to run "Rob Malda
            accepts new job as head of Debian project" 8)