Path: utzoo!utgpu!news-server.csri.toronto.edu!bonnie.concordia.ca!thunder.mcrcim.mcgill.edu!mouse
From: mouse@thunder.mcrcim.mcgill.edu (der Mouse)
Newsgroups: comp.unix.questions
Subject: Re: patches in general
Message-ID: <1991May25.123421.19755@thunder.mcrcim.mcgill.edu>
Date: 25 May 91 12:34:21 GMT
References: <1991May24.194915.29288@rigel.econ.uga.edu>
Organization: McGill Research Centre for Intelligent Machines
Lines: 34

In article <1991May24.194915.29288@rigel.econ.uga.edu>, glenn@rigel.econ.uga.edu (Glenn F. Leavell) writes:

> I ocassionaly see "patches" to various programs.  Here's a piece of
> one that I recently saw:

>> ***************
>> *** 7,10 ****
>>   sites wishing to support them and finding a feed.  In general, these
>> ! groups are not carried by the entire network due to their volume, a
>> ! restricted sphere of interest, or a different set of administrative
>>   rules and concerns.
>> --- 7,10 ----
>>   sites wishing to support them and finding a feed.  In general, these
>> ! groups are not carried by the entire network because of their volume,
>> ! restricted spheres of interest, or a different set of administrative
>>   rules and concerns.
>> ***************

> This doesn't look like standard diff stuff,

It's a so-called context diff: output from "diff -c".  In the
particular example you quoted, it's "diff -c1" - only one line of
context.

> so my question is, what package or utility is used to merge these
> changes with the original document?

Something called patch, available from fine archive sites everywhere.

					der Mouse

			old: mcgill-vision!mouse
			new: mouse@larry.mcrcim.mcgill.edu