Add conflictstyle diff3 to .gitconfig

See http://psung.blogspot.com/2011/02/reducing-merge-headaches-git-meets.html for a nice description.