6.2-Release to 6.3-Release and automatically merge changes

[RW]

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?