dotfiles

My personal shell configs and stuff
git clone git://git.alex.balgavy.eu/dotfiles.git
Log | Files | Refs | Submodules | README | LICENSE
commit ef82bf23abf294ede5c4a7815f628f38e4f1f0f7
parent 131eca02714a445b338811ed84062bdcfec689e7
Author: Alex Balgavy <alexander.balgavy@spaceapplications.com>
Date:   Mon, 16 Jun 2025 21:19:55 +0200

gitconfig: merge tool nvim

Diffstat:

Mgit/gitconfig | 2+-


1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/gitconfig b/git/gitconfig
@@ -112,7 +112,7 @@
     conflictstyle = diff3
 
 [mergetool "nvimdiff"]
-    cmd = nvim -d \"$LOCAL\" \"$MERGED\" \"$BASE\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd J\"
+    cmd = nvim -u NONE -d \"$LOCAL\" \"$MERGED\" \"$BASE\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd J\"
 [diff]
   algorithm = histogram
 [core]