Re: auto-merge for specific file types

2013/9/10 Willem <wgraaf_at_woodward.com>

> 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 ?
>
>
It is not answer to your question, but may be you find it useful.
Subversion can use arbitrary merger program, but for all files, without
fallback to standard merger.

http://svnbook.red-bean.com/en/1.7/svn.advanced.externaldifftools.html

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-13 08:33:21 CEST