Johan Corveleyn wrote:
> On Tue, Oct 14, 2014 at 5:00 AM, Perry Hutchison
> wrote:
> > Stefan Sperling 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 ca
On Tue, Oct 14, 2014 at 5:00 AM, Perry Hutchison wrote:
> Stefan Sperling 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 addi
Stefan Sperling 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
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:
> > I have entries for diff3-cmd and merge-tool-cmd in the [helpers]
> > section of .subversion/config, and they seem to be working properly.
> > However, when running
On Fri, Oct 10, 2014 at 12:53:16AM -0700, Perry Hutchison wrote:
> I have entries for diff3-cmd and merge-tool-cmd in the [helpers]
> section of .subversion/config, and they seem to be working properly.
> However, when running "svn merge --dry-run", I sometimes want all
> merge and diff3 attempts t
I have entries for diff3-cmd and merge-tool-cmd in the [helpers]
section of .subversion/config, and they seem to be working properly.
However, when running "svn merge --dry-run", I sometimes want all
merge and diff3 attempts to "fail" because I just want the report
of what files would be updated, w
