Path: utzoo!news-server.csri.toronto.edu!cs.utexas.edu!wuarchive!zaphod.mps.ohio-state.edu!casbah.acns.nwu.edu!ucsd!mvb.saic.com!ncr-sd!ncrlnk!ncrwat!news
From: news@ncrwat.Waterloo.NCR.COM (News Administration)
Newsgroups: comp.sources.d
Subject: Re: RCS merge script ???
Message-ID: <3961@ncrwat.Waterloo.NCR.COM>
Date: 4 Mar 91 15:37:20 GMT
References: <1991Feb27.200448.14036@newsserv.informatik.tu-muenchen.de>
Reply-To: ajlill@riipsdev.Waterloo.NCR.COM (Tony Lill)
Organization: E&M Waterloo, NCR Canada Ltd.
Lines: 19

In article <1991Feb27.200448.14036@newsserv.informatik.tu-muenchen.de> rommel@Informatik.TU-Muenchen.DE (Kai-Uwe Rommel) writes:
>I am a bit confused about the merge script of RCS (applies to both 4.3
>and 5.5). 

RCS (if you have a UNIX source licence) comes with a modified
Berkeley diff3 program, that behaves differently from the normal
diff3, this is the reason for the difference in the number and
type of arguments. Locally, I have used the V.4 diff3, which
appears identical to the GNU diff3. The only thing you have to do
is to remove the 'w' and 'q' commands from the end of the diff3
output. If you like, I'll mail you my merge script.




Tony Lill,                           ajlill@riipsdev.Waterloo.NCR.COM
President, A. J. Lill Consultants                 (519) 650 0660
539 Grand Valley Dr., Cambridge, Ont.             (519) 653 9732
presently at E&M Waterloo, NCR Canada Ltd.        (519) 884 1710 x624