I use CompareIt! (www.grigsoft.com) for merging, although not yet with SVN.
It's practically free (~$20) and has a really nice interface.
WinMerge is consistently one of the top downloads on SourceForge - I haven't
used it, but it looks fine.
Ken
> -----Original Message-----
> From: Ray Johnson [mailto:Rayj@ingenio.com]
> Sent: Wednesday, April 21, 2004 8:19 PM
> To: users@subversion.tigris.org
> Subject: Visual merge tool & the diff-cmd config
>
>
>
> Recently I asked a question about what Visual merge tools folks use on
> Windows. It's a deal blocker for our VSS users if they can't do
> graphical merges! :) A couple of folks suggested TortoiseMerge which
> I'm currently playing with.
>
> Unfortunately, I'm completely stuck on how to get this to
> work with the
> diff-cmd config. Currently I have the config looking something like
> this:
> diff-cmd = C:\Program Files\TortoiseSVN\TortoiseMerge.exe
>
> When I then attempt a diff (svn diff foo.cs) svn does indeed launch
> TortoiseMerge. However, it doesn't get the files associated with the
> merge. Instead it pops up a dialog asking me to select the files to
> merge. I also tried this with windiff.exe and can not get it to work
> there either.
>
> Perhaps I'm setting this wrong. I looked in the book and
> didn't really
> find any examples. I also am having a hard time finding any
> documentation that shows what svn is passing to the external
> program as
> arguments.
>
> In any case, I'm curious if anyone has some examples of how they got
> this to work on Windows with TortoiseMerge of any other diff & diff3
> program for that matter...
>
> Ray
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 22 17:58:20 2004