>  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.


/ Peter Schuller

PGP userID: 0xE9758B7D or 'Peter Schuller <[EMAIL PROTECTED]>'
Key retrieval: Send an E-Mail to [EMAIL PROTECTED]
E-Mail: [EMAIL PROTECTED] Web: http://www.scode.org

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply via email to