[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: diff and merge tools

From: Fawad Halim <fawad_at_fawad.net>
Date: 2003-12-03 18:51:42 CET

On Windows, we use WinMerge (http://winmerge.sourceforge.net/), and on
Linux kompare (inside kdesdk).

-fawad

Mike Mason wrote:

> Kerim Borchaev wrote:
>
>> Hello!
>>
>> Now I'm pretty happy with command-line svn. But me and my coworkers
>> have a VSS background - and we lack it's "visual" diff and merge tool.
>> What tools svn-people use that help them to view differences between
>> file
>> revisions and effectively hand-merge(when auto-merge doesn't help)?
>>
>>
>
> I use the Perforce diff and merge tools, available in the main
> Perforce download from http://perforce.com/perforce/downloads/ntx86.html
>
> The diff and merge tools are free for use without needing a Perforce
> licence. It's the first thing I install when someone asks me to use
> StarTeam...
>
> Cheers,
> Mike.
>
>
>
> ---------------------------------------------------------------------
> 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 Wed Dec 3 18:57:58 2003

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.