svn - Tortoise SVN 自动合并 - 禁用不起作用

Question

在我的公司，我们正在使用 TortoiseSVN，并以这种方式关闭自动合并(http://tortoisesvn.tigris.org/faq.html#noautomerge)。但是当我合并修订范围(功能分支)时，Tortoise 会自动合并，尽管我的设置。如我所料，更新期间自动合并正确失败。Tortoise 版本、合并工具设置、diff 工具设置在附件中。请帮我。谢谢

编辑:添加了 SVN 配置文件的 [helpers] 部分

### Section for configuring external helper applications.
[helpers]
### Set editor-cmd to the command used to invoke your text editor.
###   This will override the environment variables that Subversion
###   examines by default to find this information ($EDITOR, 
###   et al).
# editor-cmd = editor (vi, emacs, notepad, etc.)
### Set diff-cmd to the absolute path of your 'diff' program.
###   This will override the compile-time default, which is to use
###   Subversion's internal diff implementation.
# diff-cmd = diff_program (diff, gdiff, etc.)
diff-cmd = "C:\\SVNNoMerge.bat" 
diff3-cmd = "C:\\SVNNoMerge.bat"
### Diff-extensions are arguments passed to an external diff
### program or to Subversion's internal diff implementation.
### Set diff-extensions to override the default arguments ('-u').
# diff-extensions = -u -p
### Set diff3-cmd to the absolute path of your 'diff3' program.
###   This will override the compile-time default, which is to use
###   Subversion's internal diff3 implementation.
# diff3-cmd = diff3_program (diff3, gdiff3, etc.)
### Set diff3-has-program-arg to 'yes' if your 'diff3' program
###   accepts the '--diff-program' option.
# diff3-has-program-arg = [yes | no]
### Set merge-tool-cmd to the command used to invoke your external
### merging tool of choice. Subversion will pass 5 arguments to
### the specified command: base theirs mine merged wcfile
# merge-tool-cmd = merge_command

Answer 1

您还必须为 diff3-cmd 设置 false.bat 文件，而不仅仅是 FAQ 中所述的 diff-cmd 部分。