DiffMerge will compare and merge files and folders on a computer. It analysis selected folders and will display all differences. Then you can merge files to have the same version (keep them updated) and fix inconsistencies across different locations of computer or devices.
It supports highlights for differences found,can perform merge automatically, view analyzed folders simultaneously in 2 panels.
It can be customized.
