mergemaster comparing everything.

Warren Block wblock at
Fri Nov 12 16:40:02 UTC 2010

On Fri, 12 Nov 2010, Leon Me?ner wrote:

> is there a trick besides using the rcs funktion of mergemaster to get
> around having to look at every file in /etc for comparison?
> I know there once was a bug in mergemaster but it's closed for a long
> time now.
> 90% of the differences are just in this cvs? tag lines. This is an
> upgrade from 8.1 to -STABLE.

'mergemaster -Ui' helps.

More information about the freebsd-questions mailing list