diff options
| -rw-r--r-- | .config/git/config | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.config/git/config b/.config/git/config index aa7efef..e7cf850 100644 --- a/.config/git/config +++ b/.config/git/config @@ -9,11 +9,13 @@ [mergetool] prompt = true [mergetool "vimdiff"] - cmd = nvim --noplugin -u ~/.config/nvim/init_min.lua -d $LOCAL $REMOTE + cmd = nvim --noplugin -u ~/.config/nvim/init_min.lua -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' [difftool] prompt = false [diff] - tool = vimdiff + tool = nvimdiff +[difftool "nvimdiff"] + cmd = nvim --noplugin -u ~/.config/nvim/init_min.lua -d $LOCAL $REMOTE [user] email = brahmajit.xyz@gmail.com name = Brahmajit Das |