From 62608e0130769c053207d27b06aa3039df205610 Mon Sep 17 00:00:00 2001
From: Mira <mira@xn--2dkua.xn--tckwe>
Date: Thu, 29 Feb 2024 10:33:35 -0500
Subject: [PATCH] update gitconfig, nvim plugins

---
 AppData/Local/external_nvim                   |  2 +-
 private_dot_config/git/executable_config.tmpl | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/AppData/Local/external_nvim b/AppData/Local/external_nvim
index 1540010..23c86b3 160000
--- a/AppData/Local/external_nvim
+++ b/AppData/Local/external_nvim
@@ -1 +1 @@
-Subproject commit 154001034d30fe85b56b71deb90d9fa466fbddda
+Subproject commit 23c86b37763f3662b40cbce638bacc8791894c41
diff --git a/private_dot_config/git/executable_config.tmpl b/private_dot_config/git/executable_config.tmpl
index 472fb8b..d14b058 100644
--- a/private_dot_config/git/executable_config.tmpl
+++ b/private_dot_config/git/executable_config.tmpl
@@ -5,6 +5,7 @@ name = {{ .name | quote }}
 [core]
 editor = nvim
 pager = delta
+difftool = true
 # Remove Carriage Returns
 autocrlf = input
 eol = lf
@@ -16,8 +17,15 @@ diffFilter = delta --color-only
 navigate = true # use n and N to move between diff sections
 light = false   # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
 
+[diff]
+tool = difftastic
+
+[difftool "difftastic"]
+prompt = false
+
 [merge]
-conflictstyle = diff3
+# TODO: set this to meld or nvimdiff
+conflictstyle = zdiff3
 
 [diff]
 colorMoved = default
@@ -52,4 +60,4 @@ autoupdate = true
 enabled = true
 
 [push]
-autoSetupRemote = true
\ No newline at end of file
+autoSetupRemote = true