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

Edit conflicts

From: Ivo Amrein <ivo.amrein_at_ramatech.ch>
Date: Thu, 19 Apr 2012 03:03:14 -0700 (PDT)

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

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-04-19 13:23:04 CEST

This message: [ Message body ]
Next message: Thomas Bretscher: "RE: Re: [TSVN1.7] Fails to create a tag from folder with externals."
Previous message: Jean Hominal: "RE: TSVN 1.7.1: Can"
Next in thread: Stefan Küng: "Re: Edit conflicts"
Reply: Stefan Küng: "Re: Edit conflicts"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]

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.