On Fri, 12 Nov 2010, Leon Me?ner wrote:
On Fri, Nov 12, 2010 at 09:40:01AM -0700, Warren Block wrote:
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.
thanks, that helped. Did the default behavior of mergemaster change
somewhere because i didn't have to do this awhile ago (months not
years).
Not AFAIK, but I've been using -Ui for quite a while, so maybe I just
missed it.
_______________________________________________
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "freebsd-questions-unsubscr...@freebsd.org"
