Path: utzoo!news-server.csri.toronto.edu!cs.utexas.edu!usc!ucla-cs!twinsun!eggert
From: eggert@twinsun.com (Paul Eggert)
Newsgroups: comp.sources.d
Subject: Re: RCS merge script ???
Message-ID: <1991Mar9.030547.26580@twinsun.com>
Date: 9 Mar 91 03:05:47 GMT
References: <1991Feb27.200448.14036@newsserv.informatik.tu-muenchen.de> <3961@ncrwat.Waterloo.NCR.COM>
Sender: usenet@twinsun.com
Organization: Twin Sun, Inc
Lines: 18
Nntp-Posting-Host: ata

ajlill@riipsdev.Waterloo.NCR.COM (Tony Lill) writes:

>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.

This info is a bit out of date.  A long time ago RCS came with its own
copy of diff, but the necessary changes were folded into BSD diff before
4.3BSD.  (No doubt System V did not pick up this improvement until much
later.)  GNU diff3 did not work with RCS until GNU diff 1.15 and RCS 5.5
were published.  RCS 5.5 talks to GNU diff3 and to Unix diff3 in
completely different ways: for GNU it uses diff3's -m option, but for
Unix it uses an undocumented program that is named /usr/lib/diff3 or
/usr/5lib/rdiff3prog or something similar.