List of great merge drivers for git and other version control tools - View it on GitHub