From 25d0729668697b2204465e7ff3a68080f0445b11 Mon Sep 17 00:00:00 2001 From: druckdev Date: Fri, 18 Dec 2020 23:33:01 +0100 Subject: [PATCH] git: Use nvimdiff as merge- and difftool --- .config/git/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/git/config b/.config/git/config index fb4e8f6..ca51773 100644 --- a/.config/git/config +++ b/.config/git/config @@ -20,6 +20,7 @@ submodulesummary = true [diff] submodule = log + tool = nvimdiff [rebase] autostash = true [include] @@ -28,3 +29,4 @@ rebase = true [merge] log = true + tool = nvimdiff