diff options
| author | Ruben Beltran del Rio <ruben@unlimited.pizza> | 2023-09-21 22:22:57 +0200 |
|---|---|---|
| committer | Ruben Beltran del Rio <ruben@unlimited.pizza> | 2023-09-21 22:22:57 +0200 |
| commit | 089ad2dd938f9caabf21bfbf52179dcdf4a8c6f2 (patch) | |
| tree | dec5ad89618ff622179c0d096d087eaa92f63901 /gitconfig | |
| parent | f84fdc3b9dbfbe9bf8a80ee5dbe8a3a7337c4b28 (diff) | |
Use nvim for mergetool
Diffstat (limited to 'gitconfig')
| -rw-r--r-- | gitconfig | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -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' |