Date: Tue, 13 Mar 2001 16:34:07 +0100 From: Johan Karlsson <k@numeri.campus.luth.se> To: Martin Blapp <mb@imp.ch> Cc: current@FreeBSD.ORG Subject: Re: Proposal to mergemaster Message-ID: <200103131534.f2DFY7306851@numeri.campus.luth.se> In-Reply-To: Your message of "Tue, 13 Mar 2001 13:41:47 %2B0100." <Pine.BSF.4.21.0103131202110.988-100000@levais.imp.ch>
next in thread | previous in thread | raw e-mail | index | archive | help
At Tue, 13 Mar 2001 13:41:47 +0100, Martin Blapp wrote: > > Hi, > > After 100erts of mergemaster sessions, I'm looking for a way to improve > mergemaster. > > 1st thing, mergemaster displays per default all in changed files. That's > ok for the first time, but if you maintain many hosts, this is annoying a > lot. I have made something like this and submitted a PR http://www.freebsd.org/cgi/query-pr.cgi?pr=25771 It adds a new option to turn off the displaying of the diff result but still give the user the possibilty to view the diff if he wants to. Anyway have a look at the PR and tell me what you think. Thanks Johan K To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200103131534.f2DFY7306851>