Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 25 Aug 2003 01:24:35 -0700 (PDT)
From:      Doug Barton <dougb@FreeBSD.org>
To:        src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   cvs commit: src/usr.sbin/mergemaster mergemaster.8
Message-ID:  <200308250824.h7P8OZRZ037864@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308250824.h7P8OZRZ037864>