freebsd-update questions

[Andrew Gould]

On Mon, Jan 12, 2015 at 12:46 PM, Brian W. <brian at brianwhalen.net> wrote:

> A key thing to watch for in the conf files is that markers will be put in
> place so you can see what's new; those need to be deleted.
>
When I attempted an upgrade to 10.1-RELEASE, I got a message that certain
configuration files couldn't be merged and that I should hit the enter
button to merge them manually in vi.

In vi, the first line was a series of left pointing arrows and a reference
to version 10.0.   That was followed by the content of the new
configuration file. (I think it was new because the lines I added to the
existing files weren't there.)

The last line was a series of right pointing errors and a reference to
version 10.1.

What am I supposed to do to keep the old configuration file contents?
There are no instructions.

Thanks,

Andrew