Deactivate automatic merge

Hello,

i want to deactivate the automatic merge in Tortoise as well as in
Subclipse for the complete repository. After updating, the SVN client
should generate different files containing the different matters (my
working copy, the repository version, the version of another user and
the merged version)

 How can I do this?

Kathrin

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org

--