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

[Doug Barton]

dougb       2003/05/01 23:28:30 PDT

  FreeBSD src repository

  Modified files:
    usr.sbin/mergemaster mergemaster.8 
  Log:
  * Document the -P option
  
  * Add a paragraph suggesting that the merge option be used only for
  files that users have modified. People have been using this option
  for all files that are different, causing unecessary confusion.
  
  Revision  Changes    Path
  1.28      +17 -1     src/usr.sbin/mergemaster/mergemaster.8