Use neovim as diff tool

.gitconfig

[merge]
  tool = vimdiff
[mergetool]
  prompt = true
[mergetool "vimdiff"]
  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[difftool]
  prompt = false
[diff]
  tool = vimdiff

Why is the first wincmd with $ and the second without?

First one shouldnt have a "$" in case thats giving you problems. Otherwise this worked perfectly for me.

Why is the first wincmd with $ and the second without?

• $wincmd w focuses the last window because $ always references the highest window number.
• wincmd J moves the focused window to the bottom, so in this case the window for the merged file view.