On Tue, Oct 28, 2014 at 4:19 PM, Baptiste Daroussin <b...@freebsd.org>
wrote:
> - new 3 way merge code ("stolen" from the fossil-scm) to allow automerging
> configuration files
> - new @config keyword to mark a file as a config file (during
> upgrade/reinstallation it will try to merge the configuration with the
> one the
> user may have modified) an option AUTOMERGE is available to prevent
> automerging if automerge fails a .pkgnew file will be created along with
> the
> untouched user version of the configuration
>
Would it make sense to let the user specify the merge tool to use and
always use it, instead of having to support the merge code within pkg?
Anton
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
