Question : Use neovim as git diff and merge tool
Answered by : cl
[diff] tool = nvimdiff
[difftool] prompt = false
[difftool "nvimdiff"] cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
[merge] tool = nvimdiff
[mergetool] prompt = true
[mergetool "nvimdiff"] cmd = "nvim -d \"$LOCAL\" \"$REMOTE\" \"$MERGED\" -c 'wincmd w' -c 'wincmd J'"Source : https://jdhao.github.io/2021/01/07/nifty_nvim_techniques_s9/ | Last Update : Sat, 06 Aug 22