Re: Whitespace conflicts during merges

>> Unfortunately, the svn_client_update4() API doesn't allow to set any
>> diff options, unlike the svn_client_merge4() API.
>> Stefan
>
> If that's true, then how does the command-line svn implement '--diff3-cmd'?

the --diff3-cmd option does *not* specify that you want to ignore
whitespaces. It specifies that you want to use another diff tool
instead of the internal one.

what I'm talking about however is the '-x' parameter you can pass to
e.g. the merge command.

if you want to use an external diff tool with TSVN, you can specify
that in the config file.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2850228
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].