Re: diff and merge tools

Jan Hendrik wrote:
>>[helpers]
>>diff-cmd = D:\Program Files\WinMerge\WinMerge.exe
>>diff3-cmd = D:\Program Files\WinMerge\WinMerge.exe
>>diff-has-program-arg = true
>>diff3-has-program-arg = true
>
> I also had no luck with those settings, but in TortoiseSVN this
> works:
>
> F:\PRG\Tools\WinMerge\WinMerge.exe %mine %theirs %merged

I plan to implement something similar for core Subversion very soon.
There are a couple of issues regarding this in the issue tracker. In
the meantime you'll have to use a wrapper script to handle external
helper programs.

I'll be back... :-)

/Tobias

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Dec 4 11:48:15 2003