Fix fucking mergetool settings