Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 20 Jan 2008 18:01:20 +0000
From:      RW <fbsd06@mlists.homeunix.com>
To:        freebsd-questions@freebsd.org
Subject:   Re: 6.2-Release to 6.3-Release and automatically merge changes
Message-ID:  <20080120180120.6cc96f9a@gumby.homeunix.com.>
In-Reply-To: <94136a2c0801200713k3fdda593m4da8c93b23feaa0d@mail.gmail.com>
References:  <94136a2c0801191142r51a7715by99e56ee658621e5d@mail.gmail.com> <20080120000048.0cee1189@gumby.homeunix.com.> <94136a2c0801200713k3fdda593m4da8c93b23feaa0d@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 20 Jan 2008 16:13:26 +0100
"Zbigniew Szalbot" <zszalbot@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? 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080120180120.6cc96f9a>