On Oct 27, 2011, at 4:14 AM, Ed Schouten wrote: > * Tom Evans <tevans...@googlemail.com>, 20111027 13:06: >> I have had this happen before, the PEBKAC. When running mergemaster, >> it will prompt you to install new passwd, master.passwd and group >> files - if you have added local users you must not say yes to this, >> you must either merge the changes in or keep your local one. > > It would have been so awesome if our /etc/master.passwd and /etc/group > included an #include directive.
Or a tool like etcupdate, which provides 3-way diff functionality, was available in base.. -Garrett_______________________________________________ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"