Date: Wed, 28 Sep 2005 15:49:27 -0700 From: Doug Barton <dougb@FreeBSD.org> To: Brad Knowles <brad@stop.mail-abuse.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: <433B1DF7.9020303@FreeBSD.org> In-Reply-To: <p0620071dbf6044e1c455@[10.0.1.210]> References: <p0620070ebf57657f0697@[10.0.1.210]> <p0620071dbf6044e1c455@[10.0.1.210]>
next in thread | previous in thread | raw e-mail | index | archive | help
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 mergemaster, which has had this example in it for a long time now.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?433B1DF7.9020303>