Mike Long <mikel@shore.net> writes:

> If you think you might have a problem distinguishing your edits from
> changes made to the original file, stash an unmodified copy of
> /etc/rc.conf somewhere (e.g. /etc/rc.conf.orig) before you edit it.

RCS or CVS may be useful.  I'm personally using CVS (via small script
since /usr/src/etc is not directly equal to /etc) to import/merge
-current files.

enami.