From a208f458c1bc497db31d28f4e487b3d1e47ce2b7 Mon Sep 17 00:00:00 2001 From: Riyyi Date: Sat, 24 Feb 2024 20:36:17 +0100 Subject: [PATCH] Config: Add Neovim as git diff/merge tool --- .config/git/config | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.config/git/config b/.config/git/config index b4b02f3..b33beb1 100644 --- a/.config/git/config +++ b/.config/git/config @@ -7,3 +7,11 @@ [user] name = Riyyi email = riyyi3@gmail.com +[diff] + tool = nvimdiff +[merge] + tool = nvimdiff + conflictstyle = diff3 +[mergetool] + prompt = false + keepBackup = false