On Mon, 3 Feb 2003, Amit Rao wrote: > On Monday 03 February 2003 07:35 am, Dag-Erling Smorgrav wrote: > > Doug Barton <[EMAIL PROTECTED]> 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. > > Allow users to pass "regexps to ignore" as an option? > similar to: diff --ignore-matching-lines="\$FreeBSD:" ?
That actually has promise... probably as a mergemasterrc option. I'll give it some thought. 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 [EMAIL PROTECTED] with "unsubscribe freebsd-hackers" in the body of the message