Re: diff and merge tools

Roger Talkov wrote:

>I installed WinMerge and editied the subversion config file to specify
>WinMerge as the diff-cmd, but when I try:
>
>svn diff x.sh
>
>WinMerge shows a listing of the files in the directory.
>What is the correct config setup for WinMerge ?
>
>I used the same setup as if using Cygwin diff:
>[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
>
>
If WinMerge doesn't understand GNU diff-like command-line options,
you'll have to write a wrapper.

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org