SourceGear, known for their Vault source control software, are giving away their three-way diff & merge tool DiffMerge for Windows, Mac and Unix.
DiffMerge has a clear interface and supports for file-type specific rule-sets that allow you to decide how to deal with white-space, line-endings, encoding etc.
I'll be using it instead of my trusty KDiff for a couple of weeks to see how things go.
To use DiffMerge in AnkhSVN head into the Tools > AnkhSVN > Edit the AnkhSVN Configuration menu option and then paste each of the following command-lines into the associated configuration option.
DiffExePath
C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe "%base" "%mine" /t1="Base version" /t2="My version"
MergeExePath
C:\Program Files\SourceGear\DiffMerge\DiffMerge.exe "%base" "%theirs" "%mine" /r="%merged" /t1="Base version" /t2="Their version" /t3="My version"
Alternatively you might want to check out Trevor Green's instructions on using DiffMerge with TortoiseSVN if you are not yet sold on AnkhSVN and it's Visual Studio integration.
[)amien
cool blog.. Please visit my blog
I've always been pretty happy with WinMerge, although it doesn't have an OSX or Linux version. Doesn't have a 3-way merge but given the way I work with merging (always via patches rather than snapshots) I've never found I needed that.
I'd be a little wary of this one being abandonware (since it's not open source) but it will be interesting to see what it's like.
It's quite nice, but I do miss the syntax highlighting that WinMerge does. A small thing but I've gotten used to it.