Visual Studio Code Source code editing with version control and syntax for many languages.
WinMerge Application to compare files and folders to find differences, code changes, updates and duplicate content.
Araxis Merge Advanced two and three-way file comparison/merging and folder synchronization.