6.2-Release to 6.3-Release and automatically merge changes

[Zbigniew Szalbot]

Hello,

2008/1/20, RW <fbsd06 at mlists.homeunix.com>:
> On Sun, 20 Jan 2008 16:13:26 +0100
> "Zbigniew Szalbot" <zszalbot at gmail.com> wrote:
>
>
> > Which lines should I delete and which leave intact?
> > This one here is short but there are some other where the changes
> > apply to quite a few lines. I have trouble finding out how to "accept
> > the new versions"?
>
> I've not used freebsd-update.sh, I assumed it was just calling
> mergemaster. Does it really not give you option of accepting a whole
> file?

No, it says (for example)

The following file could not be merged automatically:
/etc/defaults/periodic.conf
Press Enter to edit this file in vi and resolve the conflicts
manually...

So I have the vi open but I wonder which lines to remove and which to leave?

Thanks!

Zbigniew Szalbot