someone, any ide pls? thanks
On Tuesday, March 19, 2013 11:41:19 AM UTC+1, Cicik wrote: > > 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 >
