update gitconfig, nvim plugins

AppData/Local/external_nvim

@@ -1 +1 @@
-Subproject commit 154001034d30fe85b56b71deb90d9fa466fbddda
+Subproject commit 23c86b37763f3662b40cbce638bacc8791894c41

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