cvs commit: src/usr.sbin/mergemaster mergemaster.sh

[Doug Barton]

dougb       2003/05/01 23:26:23 PDT

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  * Add a -P (Preserve) option, which saves a copy of files that you replace.
  The idea for this option came from Marc Schneiders <marc at 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.
  
  Revision  Changes    Path
  1.44      +50 -20    src/usr.sbin/mergemaster/mergemaster.sh