help with apache

[Alan Cox]

On Wed, 23 May 2007 15:11:47 -0700
stan <stanl at cox.net> wrote:

> On Wed, 23 May 2007 16:46:44 -0500
> "Scott Berry" <sberry at northlc.com> wrote:
> 
> > OPkay I just reinstalled httpd but how does one use diff?  I tried
> > reading the help but I am confused as to how it is used.
> > 
> > Scott
> 
> diff old_file_version new_file_version > output_file_to_save

Its best to use diff -u. The original diff format (and default) will
reassemble files wrongly in some cases. diff -u keeps context so can
handle stuff moving around properly.

So
	diff -u old new > diff.out

	patch file < diff.out