freebsd-udapte upgrade.

[Scot Hetzel]

On Wed, Nov 5, 2014 at 8:30 AM, Peter Ankerstål <peter at pean.org> wrote:
> Could someone please explain how to use freebsd-update upgrade without
> destroying all of your configuration files?
>
> I really don't understand how to use the merge function.. In this case i
> typed :q for all files it asked about. :wq seem to
> do about the same thing. Notice that a few of the files has this shit in
> multiple places. I can't be right that I should edit every file manually and
> look for "current version" and so on?
>
Most likely what happened is that when you used :wq it wrote the
contents of the diff between your current version and the new version
to your existing configuration files.  If you had stuck to using :q,
it should have left your existing configuration files alone.