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

[Doug Barton]

dougb       2003/08/25 01:27:41 PDT

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.sh 
  Log:
  MFC most of 1.4[467], the preserve replaced files option,
  and the fix for the build target
  
  Revision  Changes    Path
  1.6.2.18  +23 -4     src/usr.sbin/mergemaster/mergemaster.sh