mergemaster merge left/right

[Dan Naumov]

Speaking of mergemaster, it would be really really nice to have
"freebsd-update install" get the following functionality/options from
mergemaster:

-i   Automatically install any files that do not exist in the
destination directory.
-F   If the files differ only by VCS Id ($FreeBSD) install the new file.

This would help avoid having to manually approve installation of
hundreds of files in /etc when you upgrade to new releases using
freebsd-update.

- Sincerely,
Dan Naumov



On Fri, Jul 3, 2009 at 11:51 AM, Dominic Fandrey<kamikaze at bsdforen.de> wrote:
> I'd really like mergemaster to tell me whether the left
> or the right side is the new file.
>
> # $FreeBSD: src/etc/devd.conf,v 1.38. | # $FreeBSD: src/etc/devd.conf,v 1.38.
>
> Like this I have no idea which one to pick.
> _______________________________________________
> freebsd-stable at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-stable
> To unsubscribe, send any mail to "freebsd-stable-unsubscribe at freebsd.org"
>