Stefan Sperling <s...@elego.de> wrote: > On Fri, Oct 10, 2014 at 10:27:46AM +0200, Stefan Sperling wrote: > > On Fri, Oct 10, 2014 at 12:53:16AM -0700, Perry Hutchison wrote: > > > ... > > > It appears that I can override the diff3-cmd setting by adding > > > --diff3-cmd=/bin/false to the command, but when I try to do the > > > same thing to merge-tool-cmd (by adding --merge-tool-cmd=/bin/false) > > > I get an error message: > > > > > > svn: invalid option: --merge-tool-cmd=/bin/false > > > > > > How do I go about overriding the merge-tool-cmd setting on the svn > > > command line? > > > > > > svn version 1.6.17 (r1128011) on Ubuntu 12.04, in case it matters. > > > > > > Please Cc. > > > > Try --config-option:config:global:merge-tool-cmd=/bin/false > > Sorry, got the section name wrong: > --config-option:config:helpers:merge-tool-cmd=/bin/false
I wonder if that option may be new in 1.7 -- it doesn't seem to be recognized in 1.6.17: svn: invalid option: --config-option:config:helpers:merge-tool-cmd=/bin/false
