freebsd-nq/usr.sbin/mergemaster
Doug Barton 1317aed784 * Add a -P (Preserve) option, which saves a copy of files that you replace.
The idea for this option came from Marc Schneiders <marc@schneiders.org>

* I've been meaning to remove the code that checked for the existence of
/etc/sysconfig for a while now, since that file was last seen in 2.2.2.

* Replace the above with a check for elements of the old rc system.
Offer to move these files out of DESTDIR/etc for the user's convenience.
2003-05-02 06:26:23 +00:00
..
Makefile style.Makefile(5) 2003-04-04 17:49:21 +00:00
mergemaster.8 Try another solution for not expanding a CVS tag. 2003-02-27 08:29:30 +00:00
mergemaster.sh * Add a -P (Preserve) option, which saves a copy of files that you replace. 2003-05-02 06:26:23 +00:00