RE: diff and merge tools

Concerning RE: diff and merge tools
Roger Talkov wrote on 3 Dec 2003, 14:03, at least in part:

> 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

I also had no luck with those settings, but in TortoiseSVN this
works:

F:\PRG\Tools\WinMerge\WinMerge.exe %mine %theirs %merged

It shows my version in the left and the latest repos version in the
right pane and after editing the file is saved to the merged conflict
file (that with the markers <<<< / >>>>). Have not yet tried to
transfer this setting to SVN config.

Jan Hendrik

---------------------------------------
Freedom quote:

     The house we hope to build is not for my generation but for yours.
     It is your future that matters.
     And I hope that when you are my age,
     you will be able to say as I have been able to say:
     We lived in freedom.
     We lived lives that were a statement, not an apology.
                -- Ronald Reagan

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