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

[Doug Barton]

dougb       2007-12-24 05:48:38 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  MFC version 1.55, safety belt for the (unlikely) disappearance of
  the temproot before a -r run.
  
  Approved by:    re (kensmith)
  
  Revision  Changes    Path
  1.54.2.1  +7 -0      src/usr.sbin/mergemaster/mergemaster.sh