xxdiff is a QT based graphical file and directories comparator and merge tool. It provides comparing two files, three files.

JuxtaCode is described as 'Compare Git commits and resolve merge conflicts' and is a Diff Tool in the development category. There are more than 10 alternatives to JuxtaCode for a variety of platforms, including Mac, Linux, Windows, BSD and iPad apps. The best JuxtaCode alternative is P4Merge, which is free. Other great apps like JuxtaCode are SemanticDiff, Araxis Merge, Meld for OSX and Diffuse Merge Tool.
xxdiff is a QT based graphical file and directories comparator and merge tool. It provides comparing two files, three files.

dwdiff is a diff program that operates at the word level instead of the line level. It is different from wdiff in that it allows the user to specify what should be considered whitespace, and in that it takes an optional list of characters that should be considered delimiters.