Frank Shute <frank at shute.org.uk> writes: > 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:.*[$]' I think it's already done by FREEBSD_ID (-F) in rc file.