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

[Gordon Tetlow]

gordon      2006-06-10 21:42:49 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  MFC auto updating of files not modified by the user.
  
  Revision  Changes    Path
  1.32.2.3  +3 -1      src/usr.sbin/mergemaster/mergemaster.8
  1.51.8.3  +86 -1     src/usr.sbin/mergemaster/mergemaster.sh