Advice sought on upgrading from 4.11-R to 5.4...

Robert Backhaus robbak at gmail.com
Wed Sep 28 16:01:04 PDT 2005


On 9/29/05, Doug Barton <dougb at 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 mergemaster,
> 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?


More information about the freebsd-stable mailing list