Date: Sun, 03 Jun 2001 22:59:35 -0700 From: Doug Barton <DougB@DougBarton.net> To: Peter Wemm <peter@wemm.org> Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <3B1B23C7.8158812@DougBarton.net> References: <20010604053457.DCFD9380E@overcee.netplex.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
Peter Wemm wrote: > > Doug Barton wrote: > > dougb 2001/06/03 21:11:41 PDT > > > > Modified files: (Branch: RELENG_4) > > usr.sbin/mergemaster mergemaster.sh > > Log: > > MFC 1.19-23, cleanups and clarifications, along with some OpenBSD > > compatibility changes. No new functionality. > > Any chance you will add the hooks to read $Id$ / $FreeBSD$ and pull out the > base versions from a local cvs tree for merging with merge(1) some day? I have patches from Eivind to handle cvs merges.... I need to review those and other options, but yes, this is in the works. Doug 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?3B1B23C7.8158812>