[TSVN] TMerge and Resolve

A while back I turned on the setting in TMerge to automatically resolve on
save. Now that a resolve button is on the toolbar, I wanted to just turn
the setting off and use the toolbar instead. However, even with the
setting off, it still always resolves. This has been going on for weeks
and I have just been living with it. I only mention that to make it clear
that I did reboot.

The registry value HKCU\SOFTWARE\TortoiseMerge\Resolve is a DWORD of 0.

Is there a bug somewhere? I do make my own builds, so perhaps I screwed
something up. I just deleted the registry entry but I do not have
anything to merge at the moment. I thought I would report it in the
meantime. Perhaps someone could try turning this feature on and off and
see if they get this behavior?

Thanks

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Feb 15 20:37:26 2005