views:

141

answers:

11

My Source Safe file comparer (diff) doesn't say where in the line there are differences. Which tool would I use for that?

And before someone tries to move it to SU, please note that we developers rely on these diff tools more than anyone else.

+3  A: 

WinMerge does inline comparison. I don't know about "best", but it is free.

Ferruccio
Many people that I know use this. And you beat me to posting the link to it.
SteveM
+3  A: 

The one included with TortoiseSVN does a decent job.

EFraim
+4  A: 

I like SourceGear's free diffmerge. They built it to work with their source control systems, so it's pretty feature-rich.

David Norman
+1 for cross-platform. I may have a new diff tool.
Ferruccio
+3  A: 

BeyondCompare is also an excellent choice.

Adam Robinson
+3  A: 

BeyondCompare is excellent, though not free. There is a screenshot of the within-line difference view on their website.

Michael Donohue
+1 for pointing out that it's not free.
Jeff Yates
A: 

Total Commander has this functionality.

CD
+2  A: 

I love using ExamDiff Pro.

Matt Davis
+2  A: 

Araxis Merge is a good one.

Chris Missal
It's the BEST one! :-) Plus they support three-way comparison + merging, and have been one of the few to compare ANSI to Unicode versions
marc_s
I've been using Araxis Merge Pro (3 way comparison) for 10 years+. I haven't upgraded to more recent versions, but I had a look at their website the other day - the latest version has incredible features (image differencing and all sorts of different document type differencing). Very useful if you need that stuff.For me its the comparison and intra-line differencing that is really useful. I use it mainly for C/C++/asm/text/HTML/PHP/css/js.
Stephen Kellett
+1  A: 

BeyondCompare. Specially like their folder comparision option.

A: 

I like P4Merge...

http://www.perforce.com/perforce/products/merge.html

Jesper Palm