[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Edit conflicts

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 20 Apr 2012 20:15:14 +0200

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.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-04-20 20:15:24 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.