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

[Doug Barton]

dougb       2008-06-11 18:54:06 UTC

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 
  Log:
  SVN rev 179725 on 2008-06-11 18:54:06Z by dougb
  
  Document the AUTO_UPGRADE (-U) knob for .mergemasterrc
  
  Submitted by:   mezz
  No Cookie For:  gordon  :)
  
  Revision  Changes    Path
  1.37      +3 -0      src/usr.sbin/mergemaster/mergemaster.8