Date: Wed, 5 Feb 2003 03:21:04 -0800 (PST) From: Doug Barton <DougB@FreeBSD.org> To: Amit Rao <fbsd@atyantik.net> Cc: Dag-Erling Smorgrav <des@ofug.org>, Garance A Drosihn <drosih@rpi.edu>, hackers@FreeBSD.org Subject: Re: Modifying mergemaster behavior Message-ID: <20030205031711.O27397@12-234-22-23.pyvrag.nggov.pbz> In-Reply-To: <200302031413.41855.fbsd@atyantik.net> References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> <xzpy94xa6fb.fsf@flood.ping.uio.no> <200302031413.41855.fbsd@atyantik.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 3 Feb 2003, Amit Rao wrote:
> Allow users to pass "regexps to ignore" as an option?
> similar to: diff --ignore-matching-lines="\$FreeBSD:" ?
I decided to be more general, and added the DIFF_OPTIONS variable to the
script, and an example of -I$FreeBSD:.*$ to the man page. For now I'm
going to leave this as a "power user" ~/.mergemasterrc file option. Once
people have a chance to use this and provide feedback on it, I may add a
command line option for it.
Thanks again for all the ideas,
Doug
--
If it's moving, encrypt it. If it's not moving, encrypt
it till it moves, then encrypt it some more.
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030205031711.O27397>