git: stop using the 'diff3' conflict style
git: stop using the 'diff3' conflict style

I still find this style useful, but I recently haven't found myself
using the "common ancestor" part of this style's output very often, so
I'm going to go back to the default diff style.

jparise/dotfiles,jparise/dotfiles,jparise/dotfiles,jparise/dotfiles