Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 8 Apr 2002 03:35:16 -0700 (PDT)
From:      Doug Barton <dougb@FreeBSD.org>
To:        cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh
Message-ID:  <200204081035.g38AZGQ60809@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 
dougb       2002/04/08 03:35:16 PDT

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  MFC 1.27 - 1.29.
  
  * Pre buildworld and post-mm file comparison modes
  * Some small code improvements
  * Delete files in ${TEMPROOT}/usr/obj to avoid comparing them
  
  Revision  Changes    Path
  1.5.2.9   +12 -1     src/usr.sbin/mergemaster/mergemaster.8
  1.6.2.11  +92 -25    src/usr.sbin/mergemaster/mergemaster.sh

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message

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