sysutils/etcmerge vs mergemaster

[RW]

On Sat, 17 Nov 2007 11:15:58 +0100
Peter Schuller <peter.schuller at infidyne.com> wrote:

> Hello,
> 
> etcmerge, with three-way merging, has been available for a while, but
> the man page still warns of it not being extensively tested, and of
> course mergermaster still seems to be the officially supported tool.
> 
> In spite of this, etcmerge is attractive since, to be honest,
> manually saying "yes update" to a bunch of files that mostly have
> only CVS revision changes is a waste of time.

 Isn't that what the -U option in mergemaster does?  


   -U       Attempt to auto upgrade files that have not been user
                                                       modified.


BTW does  etcmerge handle the merging of passwd and groups well,
because that's what I hate more than anything else about upgrading.