Kompare - Kompare is a GUI front-end program that enables differences between source files to be viewed and merged.
kdiff3 - KDiff3 is a file and directory diff and merge tool which compares and merges two or three text...
IntelliJ IDEA - Capable and Ergonomic IDE for JVM
Devart Code Compare - Code Compare is an advanced file and folder comparison tool. Its intuitive interface allows you to merge differing files and folders fast and easily! And it's FREE!
Beyond Compare - Beyond Compare allows you to compare files and folders.
Sublime Merge - Fast git client with integrated merge tool from the makers of Sublime Text