Relay-Version: version B 2.10 5/3/83; site utzoo.UUCP
Path: utzoo!linus!decvax!ittvax!dcdwest!sdcsvax!sdcrdcf!hplabs!sri-unix!mike@BRL-TGR.ARPA
From: mike@BRL-TGR.ARPA
Newsgroups: net.unix-wizards
Subject: Re:  SCCS and RCS
Message-ID: <1462@sri-arpa.UUCP>
Date: Fri, 29-Jun-84 16:41:20 EDT
Article-I.D.: sri-arpa.1462
Posted: Fri Jun 29 16:41:20 1984
Date-Received: Sun, 8-Jul-84 08:49:45 EDT
Lines: 9

From:      Mike Muuss <mike@BRL-TGR.ARPA>

The feature that I like best is RSCMERGE (aka "co -j").
This allows changes from two diverging streams of development
to be merged.  Personally, I use this to cope with merging
local changes to the kernel with changes from elsewhere.
Both systems have a common origin (the distribution).
SCCS may have this capability, but I couldn't say.
		-Mike