6.2-Release to 6.3-Release and automatically merge changes

[Zbigniew Szalbot]

Hello,

> Anything in /etc/defaults/ should not have been edited, so just accept
> the new version. If you *have* edited it, you'll have to handle this
> manually, and put you changes in the right place.

I don't think I have ever edited any file in /etc/defaults but then...
sometimes my mind plays a trick on me.

> > Then it asked about sendmail files which I have never ever touched (I
> > do not use sendmail). Some others are not sendmail-related but I have
> > not touched them either.
>
> Accept the new versions.

When I have these strings:

<<<<<<< current version
# $FreeBSD: src/etc/defaults/periodic.conf,v 1.33.2.1 2006/03/08
23:01:18 brueffer Exp $
=======
# $FreeBSD: src/etc/defaults/periodic.conf,v 1.33.2.3.2.1 2007/12/06
08:11:19 jhb Exp $
>>>>>>> 6.3-RELEASE

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"?

Thanks!

Zbigniew Szalbot