A file and folder comparison tool, targeted at developers, with powerful merging capabilities. Easily integrate with git or other version control system and diff and merge files with the 3-ways merge and powerful alignment operations.