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

[Robert Watson]

rwatson     2006-02-04 18:24:06 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  Add a -A argument to mergemaster to allow explicitly specifying an
  architecture to pass through to the underlying makefiles.  This is
  quite useful when building on an i386 box to populate an amd64 NFS
  root.
  
  Head nod:       dougb
  MFC after:      1 week
  
  Revision  Changes    Path
  1.34      +6 -1      src/usr.sbin/mergemaster/mergemaster.8
  1.53      +11 -7     src/usr.sbin/mergemaster/mergemaster.sh