Updated gitconfig.

Added beyond compare as mergetool.