Formatting fixes in .gitconfig
Add bin/diffconflicts