Hello, we use TortoiseSVN 1.11.1 (updated to this version after a long time) and it seems that the hack to disable automerge doesn't work anymore (see here https://www.codeproject.com/Tips/157286/Prevent-Subversion-from-doing-automatic-merges or in the FAQ).
diff-cmd and diff3-cmd is set to the batchfile which contains the two lines of code but it seems that this has no effect anymore. Any idea how to prevent automerge and show files as conflict due updating? Greetings Stefan -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/e0093213-08cd-4e04-a782-748c92d8592b%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
