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

Mon Aug 25 01:24:36 PDT 2003

dougb       2003/08/25 01:24:35 PDT

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.8 
  Log:
  MFC 1.28, docs for the -P (preserve replaced files) option,
  and why not to merge files you didn't modify
  
  Revision  Changes    Path
  1.5.2.13  +17 -1     src/usr.sbin/mergemaster/mergemaster.8