search

git-up / GitUp

The Git interface you've been missing all your life has finally arrived.
http://gitup.co
GNU General Public License v3.0
11.48k stars 1.25k forks source link

"Resolve in merge tool" no longer working. #878

Open schwa opened 1 year ago

schwa commented 1 year ago

Tool exited with non-zero status (127)

This started happening in Gitup 1.3.3 or maybe a point version early. I will download older versions to confirm if possible.

Here is my git config that I've been using for months:

[merge]
tool = "Sublime Merge"

[mergetool "Sublime Merge"]
cmd = smerge mergetool \"$BASE\" \"$REMOTE\" \"$LOCAL\" -o \"$MERGED\"

Doing a merge via the CLI and invoking git mergetool from the CLI works as expected.