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

[Doug Barton]

dougb       2005-12-21 08:59:22 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Change the default for deleting stale files from yes (which violates
  the general principle that mm should do nothing by default) to no.
  
  PR:             bin/85449
  Submitted by:   Kevin Oberman <oberman at es.net>
  
  Revision  Changes    Path
  1.52      +5 -5      src/usr.sbin/mergemaster/mergemaster.sh