Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 15 Jul 2001 21:02:39 -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:  <200107160402.f6G42dh94824@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 

dougb       2001/07/15 21:02:39 PDT

  Modified files:        (Branch: RELENG_4)
    usr.sbin/mergemaster mergemaster.8 mergemaster.sh 
  Log:
  Catch up to the latest fixes from -current
  
  Revision  Changes    Path
  1.5.2.7   +8 -9      src/usr.sbin/mergemaster/mergemaster.8
  1.6.2.8   +14 -7     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?200107160402.f6G42dh94824>