Re: Auto-merge control...

Jeff Fendley wrote:
> Stefan Küng <tortoisesvn <at> gmail.com> writes:
>
>> To disable auto merging completely, edit the config file (settings
>> dialog, general page, click on "Edit").
>> In the [helpers] section of the config file, you can specify which
>> diff-cmd and diff3-cmd Subversion should use. If you specify there e.g.
>> a batch file which always returns FALSE, Subversion then always creates
>> a conflict and doesn't merge the changes automatically.
>>
>> Stefan
>>
>
> This solution makes "Create Patch" fail (creates an empty patch). Would it be
> possible to add preferences which allow for different diff-cmd args for patching
> than for updating?

Good idea!
Done in revision 11411.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org