Best graphical source code diff viewer/editor for code comparison and merging?
- by Assaf Lavie
The options for source code diff viewing/editing/merging seem to be:
Free:
Tortoise Merge
Meld *
WinDiff
WinMerge *
DiffMerge *
KDiff
AJC Diff
Commercial:
Total Commander's Diff viewer *
Beyond Compare *
Delta Walker *
Araxis Merge *
Are there any other options? (Wikipedia suggests a few)
What's your favorite tools for source code diff? And how does it differ from the ones in the list?
* Supports directory diffs