> diff -u squid.conf.default squid.conf >local.diffs
> cp squid.conf.default squid.conf
> patch -s <local.diffs
GNU diff3 (a recent-ish version) is good for this sort of thing:
diff3 -A -m ourconf-beta10 defaultconf-beta10 defaultconf-beta11
The output is the differences between defaultconf-beta10 and defaultconf-beta11
merged into ourconf-beta10, with conflicts marked with >>>>, ====, <<<< lines.
Fix up the conflicts, and you're set.
- Mike
-- | Mike Battersby | mike@starbug.bofh.asn.au | | http://www.deakin.edu.au/~mib/ | mib@deakin.edu.au |Received on Wed Oct 30 1996 - 15:48:21 MST
This archive was generated by hypermail pre-2.1.9 : Tue Dec 09 2003 - 16:33:24 MST