git mergetool setup changed