subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Cicik <jarozu...@gmail.com>
Subject TortoiseSVN automerge problem
Date Tue, 19 Mar 2013 10:41:19 GMT
Hi,
in my company we are using TortoiseSVN with automatic merges turned off 
this way( http://tortoisesvn.tigris.org/faq.html#noautomerge ). But when I 
am merging range of revision(feature branch), Tortoise do automatic merges, 
despite my setting. During Update automatic merge correctly fails as I 
expected.
Tortoise version, merge tool setup, diff tool setup and config are in 
attachement.
Please help me.
Thanks

Mime
View raw message