This adds git integration for mergiraf. It sets up git to use mergiraf to automatically resolve merge conflicts.
Bob van der Linden