On 2014-04-09 09:54, Dru Lavigne wrote: > > >> Having the -i and -F options is something I would like to see too, or at >> least offered in a <tip>. > > > > Does changing that line to the following make sense? If so, I'll commit it. > > # mergemaster -piF > > Cheers, > > Dru > > _______________________________________________ > freebsd-doc@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-doc > To unsubscribe, send any mail to "freebsd-doc-unsubscr...@freebsd.org" >
The -p is for 'pre-installworld', it does only the things to make the installworld not fail (like adding the users that some files might be owned by, for example when the _audit user was introduced) -- Allan Jude
signature.asc
Description: OpenPGP digital signature