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

[Robert Watson]

rwatson     2006-02-13 23:47:48 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  Merge mergemaster.8:1.34, mergemaster.sh:1.53 from HEAD to RELENG_6:
  
    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
  
  Approved by:    re (scottl)
  
  Revision  Changes    Path
  1.32.2.2  +6 -1      src/usr.sbin/mergemaster/mergemaster.8
  1.51.8.2  +11 -7     src/usr.sbin/mergemaster/mergemaster.sh