Date: 4 Feb 2003 16:19:46 +0100 From: "clemens fischer" <ino-qc@spotteswoode.de.eu.org> To: "Garance A Drosihn" <drosih@rpi.edu> Cc: "Doug Barton" <DougB@FreeBSD.ORG>, "Dag-Erling Smorgrav" <des@ofug.org>, freebsd-hackers@FreeBSD.ORG Subject: Re: Modifying mergemaster behavior Message-ID: <4r7kkr8t.fsf@ID-23066.news.dfncis.de> In-Reply-To: <p05200f4cba64ed4989d3@[128.113.24.47]> (Garance A Drosihn's message of "Mon, 3 Feb 2003 23:26:51 -0500") References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <p05200f24ba5c8412dcd1@[128.113.24.47]> <200301281908.h0SJ8OoY028183@apollo.backplane.com> <p05200f26ba5c85ee4c77@[128.113.24.47]> <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> <xzpy94xa6fb.fsf@flood.ping.uio.no> <20030203091128.Y4113@12-234-22-23.pyvrag.nggov.pbz> <p05200f4cba64ed4989d3@[128.113.24.47]>
next in thread | previous in thread | raw e-mail | index | archive | help
Garance A Drosihn <drosih@rpi.edu>:
> I happen to be updating my system tonight, so when it came to the
> mergemaster step I first modified the script. I added:
> -I '$FreeBSD:.*$'
> to the 'diff ${DIFF_FLAG}' command in diff_loop, and it seems to have
> worked the way I wanted it to work.
how about making this an option value to the `-c' option? `-c'
normally just switches to context-diffs, why not allow users to
specify his custom diff(1) options here and in the ~/.mergemasterrc?
clemens
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?4r7kkr8t.fsf>