preserved-conflict-file-exts

Hi All,

I'm having an issue with a special compare and merge tool I'm trying to use with TortoiseSVN.

The tool is checking the file extensions of the two files before launching and gives me an error as the conflict files have changed extension to reflect it's revision.

To solve this I'm investigating the configuration option preserved-conflict-file-exts.

I have tried setting it in the config file using the TortoiseSVN Settings, Edit on subversion configuration file and I have also tried setting the same in the registry.

For some reason TortoiseSVN doesn't seem to respect my setting but instead creates conflict files as normal changing the extension to .r123

Grateful for any help.

Best Regards,
Magnus Carlsson

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-03-11 12:59:34 CET