Use default mergetool for git again