kdiff3 - KDiff3 is a file and directory diff and merge tool which compares and merges two or three text...
Visual Studio Code - Build and debug modern web and cloud applications, by Microsoft
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!
IntelliJ IDEA - Capable and Ergonomic IDE for JVM
Beyond Compare - Beyond Compare allows you to compare files and folders.
Meld - What is Meld? Meld is a visual diff and merge tool targeted at developers.