From owner-freebsd-hackers Mon Feb 3 4:35:10 2003 Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 996A137B401; Mon, 3 Feb 2003 04:35:09 -0800 (PST) Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFC2943F85; Mon, 3 Feb 2003 04:35:08 -0800 (PST) (envelope-from des@ofug.org) Received: by flood.ping.uio.no (Postfix, from userid 2602) id F30955371; Mon, 3 Feb 2003 13:35:05 +0100 (CET) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: Doug Barton Cc: Garance A Drosihn , Matthew Dillon , freebsd-hackers@FreeBSD.org Subject: Re: Modifying mergemaster behavior References: <200301281844.h0SIie3G086935@repoman.freebsd.org> <200301281908.h0SJ8OoY028183@apollo.backplane.com> <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> From: Dag-Erling Smorgrav Date: Mon, 03 Feb 2003 13:35:04 +0100 In-Reply-To: <20030201235429.G77226@12-234-22-23.pyvrag.nggov.pbz> (Doug Barton's message of "Sun, 2 Feb 2003 00:10:55 -0800 (PST)") Message-ID: Lines: 14 User-Agent: Gnus/5.090007 (Oort Gnus v0.07) Emacs/21.2 (i386--freebsd) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Doug Barton writes: > On Tue, 28 Jan 2003, Garance A Drosihn wrote: > > Well for one thing, if a given file has a lot of changes, then I > > would like mergemaster to skip over the initial one-line change > > that only tells me how some comment now has a new version-number > > in it. > This is an oft-requested feature, but I'm not sure how best to implement > it. Look up the -I option in the diff(1) man page. DES -- Dag-Erling Smorgrav - des@ofug.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message