auto-merge for specific file types

I would like to invoke a custom diff3 tool for automatically merging files of a certain type, but retain the internal diff3 for all other files.

The issue is that the internal diff3 generates conflicts that could be largely avoided with a custom diff3, reducing the need for manual conflict resolution.

Can this be done with TortoiseSVN ?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3064277

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-10 19:56:16 CEST