Add diff3 for git merge conflicts