Reconfigure git diff and merge tool