How to turn off "Merge non-interactive"

Hi Folks,

How do I uncheck the box "Merge non-interactive" in the merge window to get back to interactive merging? I checked the box once and now it is always checked. I want to switch back to interactive merging. If I uncheck the box while a merge is occurring it continues to be non-interactive for that current merge and all future ones (the box is once again checked for the next merge I perform).

In the config file I also changed the option to:

interactive-conflicts = yes

with no effect.

TSVN 1.6.10 Build 19898

Thanks for any help you may be able to provide!

Tim

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-02-01 17:20:51 CET