diff --git a/dot_config/git/config b/dot_config/git/config index 1f7352d..376fd15 100644 --- a/dot_config/git/config +++ b/dot_config/git/config @@ -40,5 +40,5 @@ smtpserveroption = tdj [merge] - tool = vimdiff + tool = nvimdiff conflictstyle = diff3