Sublime Forum

Configuring Diff-Doc in Sublime Merge


I am trying to do a diff against a parent in Sublime Merge and I am getting the following error:

Unknown merge tool diff-doc
fatal: external diff died

I believe I have everything setup in my .gitconfig correctly, but I am obviously missing something.
Here is the pertinent setting in .gitconfig

tool = smerge

[mergetool “smerge”]
cmd = smerge mergetool “$BASE” “$LOCAL” “$REMOTE” -o “$MERGED”
trustExitCode = true

tool = smerge

[difftool “smerge”]
cmd = smerge “$BASE” “$LOCAL” “$REMOTE”