Date: Thu, 29 Sep 2005 09:01:02 +1000 From: Robert Backhaus <robbak@gmail.com> To: Doug Barton <dougb@freebsd.org> Cc: FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org> Subject: Re: Advice sought on upgrading from 4.11-R to 5.4... Message-ID: <d449958050928160142dc897a@mail.gmail.com> In-Reply-To: <433B1DF7.9020303@FreeBSD.org> References: <p0620070ebf57657f0697@10.0.1.210> <p0620071dbf6044e1c455@10.0.1.210> <433B1DF7.9020303@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 9/29/05, Doug Barton <dougb@freebsd.org> wrote: > Brad Knowles wrote: > > > However, it would be nice if mergemaster could be made to > > automatically accept changes that occur only in the comments of the > > files it is trying to merge. > > What would be nice is if people actually read the man page for mergemaste= r, > which has had this example in it for a long time now. I just read the mergemaster man page (6.0B2 box), and it contains no usch example, or reference. None of the options seem to have this effect either. Maybe you are thinking of an Open- of NetBSD mergemaster?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?d449958050928160142dc897a>