On Fri, 24 Jan 2014 11:33:01 -0500 Rick Miller wrote: > The results are many merges that could not occur mainly due to the CVS > version lines despite having /etc/mergemaster.rc setup. Here is the > contents of the config file: freebsd-update doesn't use mergemaster.