yousseb / meld

Meld for macOS
https://yousseb.github.io/meld/
GNU General Public License v2.0
2.28k stars 119 forks source link

mergetool fails with gitconfig #109

Open bonner opened 4 years ago

bonner commented 4 years ago

I have configured git with the config on https://yousseb.github.io/meld/ but when I do git mergetool meld is opened, but I have three warnings that it could not read any of the files, it is using absolute paths. ie I have run git mergetool from the root of my repo, but when it opens the files it is trying to read /src and not ./src. I spent a little time mucking around with the .gitconfig but at this point I am just going to install command line meld.

mbidewell commented 3 years ago

Interestingly. Installing meld from brew does not exhibit this issue and works with git out of the box. The brew install this meld build as a cask. but uses a simpler wrapper script instead of the open call.

`#!/bin/sh

exec '/Applications/Meld.app/Contents/MacOS/Meld' "$@"`