Re: Edit conflicts

On 19.04.2012 12:03, Ivo Amrein wrote:
> I have set up Tortoise to use a different merge / diff tool depending on the file ending. This works fine if a conflict occurs after update.
>
> However if I merge my project, and the Resolve Conflict dialog appears, tortoise use tortoise merge instead of the specific merge / diff tool.
>
> This is really annoying since I have to search all conflicts after merging again.
>
> How can I force tortoise to use the same settings for this dialog as well?
>
> I'm using 1.6.16

That's unfortunate, but nothing I can do for your version.
The reason this doesn't work is because of a workaround to avoid a crash
in the svn library.
I'll do some testing with the latest version now and see if I can remove
that workaround. But for your version, the workaround is required or the
merge would crash.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2950258
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].