From: Ruben Beltran del Rio Date: Thu, 21 Sep 2023 20:22:57 +0000 (+0200) Subject: Use nvim for mergetool X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/089ad2dd938f9caabf21bfbf52179dcdf4a8c6f2 Use nvim for mergetool --- diff --git a/gitconfig b/gitconfig index cc14fe3..f3cb18d 100644 --- a/gitconfig +++ b/gitconfig @@ -21,3 +21,10 @@ defaultBranch = main [diff] external = difft + tool = vimdiff +[merge] + tool = nvim +[mergetool] + keepBackup = false +[mergetool "nvim"] + cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'