I previously changed my git diff tool with git config --global diff.external . I decided I don\'t like that tool and wanted to switch back.
git config --global diff.external
Try git config --global --unset diff
git config --global --unset diff
and
git config --global --unset diff.external
See the explanation of git config for further details.