I was eager to try out the new git mergetool integration, but I ran into a problem:
I'm running Ubuntu 18.04 and installed the SublimeMerge .deb package.
First i followed the instructions in the docs to add
smerge as a custom mergetool
But when I run
git mergetool I get the following error:
Unable to find a git repository at /usr/bin/smerge
If I instead use
/opt/sublime_merge/sublime_merge as the command instead of smerge, it works. I suspect it has to do with the extra
--fwdargv0 "$0" in the smerge script the smerge mergetool doesn't handle well.
Do you see this problem as well!
Kudos on the good work by the way! SublimeMerge seems to be shaping up nicely!