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

[Doug Barton]

dougb       2004/01/06 10:06:38 PST

  FreeBSD src repository

  Modified files:        (Branch: RELENG_5_2)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  Commit the fix from 1.49 which prevents false positives in the
  -p (pre-world) case
  
  Approved by:    re (scottl)
  
  Revision  Changes    Path
  1.47.2.2  +4 -5      src/usr.sbin/mergemaster/mergemaster.sh