.osx shall be executable
Add mergetool to .gitconfig