add diff.tool to gitconfig
remove tab indent from gitconfig