git mergetool nvim

2023-08-23 07:50:58 +00:00
parent 87ac7d3773
commit 34dbf0e321
1 changed files with 6 additions and 0 deletions
--- a/git/.gitconfig
+++ b/git/.gitconfig
@ -37,3 +37,9 @@
    po = push origin
 [core]
 	autocrlf = false
+
+[merge]
+    tool = "nvim"
+
+[mergetool "nvim"]
+	cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"