glenn@rigel.econ.uga.edu (Glenn F. Leavell) (05/25/91)
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, so my question is, what package or utility is used to merge these changes with the original document? Thanks for any help, Glenn Leavell glenn@rigel.econ.uga.edu
mouse@thunder.mcrcim.mcgill.edu (der Mouse) (05/25/91)
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