Johan Corveleyn <jcor...@gmail.com> wrote: > On Tue, Oct 14, 2014 at 5:00 AM, Perry Hutchison <per...@pluto.rain.com> > wrote: > > 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. ... > --config-option config:helpers:merge-tool-cmd=/bin/false
Thank you, that seems to work. At least, it does not give an error message and the command output looks reasonable. (I don't know how to demonstrate conclusively that it actually set the option, because setting this is just a precaution: I haven't actually run into a case that invokes the merge-tool-cmd during the kind of merge that caused the inquiry to arise.)
