use ediff for git mergetool