PAYWARE

• Beyond Compare (win + linux) - http://www.scootersoftware.com/

• Araxis Merge (win + osX) - http://www.araxis.com/merge/index.html

• ExamDiff (win) - http://www.prestosoft.com/ps.asp?page=edp_examdiff

• ECMerge (win, osX, linux) - http://www.elliecomputing.com/Home/default.asp

• MergePlant (win) - http://www.mikado-ltd.com/

• Changes (OSX) http://www.changesapp.com

FREEWARE

• WinMerge (win) - http://winmerge.org/

• Diff Merge from SourceGear - http://www.sourcegear.com/diffmerge/index.html

• Perforce Merge (win + linux + osX) - http://www.perforce.com/perforce/products/merge.html

• meld - sudo apt-get install meld

• Vimdiff - vim distribution

• Tortoise SVN - http://tortoisesvn.net/

• KDiff3 - http://kdiff3.sf.net/

• ediff - EMacs distribution

• Tiny Hexer

• Kompare (KDE, linux) - http://www.caffeinated.me.uk/kompare/

• FileMerge (osX) - http://en.wikipedia.org/wiki/Apple_Developer_Tools#FileMerge

• tkdiff (win, linux) - http://tkdiff.sourceforge.net