use nvim as git mergetool

2022-02-23 11:24:31 +03:00
parent 08cea9d553
commit 7b6ff5e796
1 changed files with 7 additions and 1 deletions
--- a/config/.gitconfig
+++ b/config/.gitconfig
@@ -2,8 +2,14 @@
 	email = daniil@tsivinsky.com
 	name = Daniil Tsivinsky
 [core]
-	editor = nvim
+	editor = vim
 [init]
 	defaultBranch = master
 [push]
 	followTags = true
+[mergetool "nvim"]
+  cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
+[merge]
+  tool = nvim
+[mergetool]
+  prompt = false