Path: utzoo!utgpu!jarvis.csri.toronto.edu!cs.utexas.edu!tut.cis.ohio-state.edu!ucbvax!decwrl!ames!eos!ptolemy!fineman
From: fineman@ptolemy.arc.nasa.gov (Charles Fineman)
Newsgroups: gnu.utils.bug
Subject: Re: Need RCS variant of diff3
Message-ID: <3524@maslow.ptolemy.arc.nasa.gov>
Date: 12 Jan 90 00:32:58 GMT
References: <742@npiatl.UUCP> <9001112246.AA05573@wheat-chex>
Distribution: gnu
Organization: NASA-Ames Research Center, Moffett Field, CA
Lines: 24

Leonard H. Tower Jr. writes:
> 
>    viar1!merrick@UUNET.UU.NET writes:
> 
>    >	* The System V I am using does not have the diff and diff3 versions
>    >	  required by RCS.
> 
>    Get an earlier version of RCS, like 1.3.  It included diff and diff3 source.
>    I can provide it if you will email me.
> 
> Or pick up the GNU diff from prep.ai.mit.edu or one of the other fpt
> or uucp archives.  gnu@prep.ai.mit.edu can send you a list.
> 
> enjoy -len 

Well, the GNU diff program won't work without modification. The diff3
that RCS wants to use is the one in /lib (or it is /usr/lib). The
point being that RCS passes the version numbers of the respective
input files so one can see which conflicting change belongs to which
version. I modified my private version but I'll post the diffs if you
folks are interested (I may do it anyways, but there's a better chance
if someone prods me!)

	~Chuck Fineman