sysutils/etcmerge vs mergemaster

[Peter Schuller]

>  Isn't that what the -U option in mergemaster does?
>
>
>    -U       Attempt to auto upgrade files that have not been user
>                                                        modified.

I believe I tried this once and it did not make a difference, but I didn't 
investigate. Perhaps I screwed up.

But even so, three-way merging is nice, so etcmerge remains interesting.

Thanks,

-- 
/ Peter Schuller

PGP userID: 0xE9758B7D or 'Peter Schuller <peter.schuller at infidyne.com>'
Key retrieval: Send an E-Mail to getpgpkey at scode.org
E-Mail: peter.schuller at infidyne.com Web: http://www.scode.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part.
Url : http://lists.freebsd.org/pipermail/freebsd-questions/attachments/20071118/577883cf/attachment.pgp