Enable diff3 git merge conflict.