mergetool script to go with gitconfig