gitconfig: Turn on diff3 for merge conflicts.

Had no idea this existed until I read
http://blog.ezyang.com/2010/01/advanced-git-merge/ :)