Conflict Resolve Issue 2:

I use an external program (Kdiff) for merges/conflict
resolutions. The issue I have is that it seems to not use
the Kdiff first. For example, when I do an update and a
conflict comes up, I then double click to edit/resolve.
 It then launches Kdiff and Kdiff says all merged and no
conflicts. Why is this? Does TSVN use it’s own merge
first? Does anyone else experience this?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Oct 3 23:51:10 2007