In my daytime life, I work in a Windows shop but we've abandoned the Diff tool
that is part of Visual Studio - it's not granular enough and has a weak UI.
We use Araxis Merge. See http://www.araxis.com/merge/index.html
Marc
Quoting Mike Mason <mgm@thoughtworks.net>:
> 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:35:21 2003