I'm trying to setup Meld as my difftool as this is something I've used for a few years now and what I'm comfortable with.
As usual, I setup my meld on my PATH
and put
[merge]
tool = meld
[diff]
guitool = meld
in my global config.
Now, when I do git mergetool
upon conflicts, I get this strange error:
And my meld is opening up like this:
I've tried several variations of the difftool command like:
[mergetool "meld"]
cmd = meld.exe "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
(one of those at a time) and, while local works, base and remote doesn't work. Executing git mergetool
produces these files in my local dir:
Which is in line with the first error - cannot mv or cp to things... how do I fix this please?