Example of how to configure a custom git merge driver - View it on GitHub