On Mon, Jul 26, 2010 at 06:18:22PM -0700, zaxis wrote: > > > that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0. >
You might also want to put this line in mergemaster.rc: DIFF_OPTIONS='-I$FreeBSD:.*[$]' That makes mergemaster ignore changes in the CVS tags. With a good rc and a basic understanding of vi, you should be in good shape to make progress. I hated mergemaster when I first started using it but I love it now! Now I have to learn to love the "mergemaster" that freebsd-update uses... Anybody know how to make it ignore CVS tags? Regards, -- Frank Contact info: http://www.shute.org.uk/misc/contact.html _______________________________________________ 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"
