From 696701e4204cff819804f7eebdab2255c3c2d0f4 Mon Sep 17 00:00:00 2001 From: DarkWiiPlayer Date: Thu, 20 Feb 2025 21:03:51 +0100 Subject: [PATCH] Switch git mergetool to nvimdiff --- gitconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gitconfig b/gitconfig index 1c2636b..325a233 100644 --- a/gitconfig +++ b/gitconfig @@ -8,13 +8,12 @@ # Sign commits by default gpgSign = true [diff] - tool = vimdiff - guitool = gvimdiff + tool = nvimdiff [difftool] confirm = false prompt = false [merge] - tool = vimdiff + tool = nvimdiff [push] default = nothing [alias]