Configure git mergetool if gvim is accessible