From 6643fe070cce356d5b9dedbb261b130b8f09f5ce Mon Sep 17 00:00:00 2001
From: Amolith <amolith@secluded.site>
Date: Wed, 8 Oct 2025 13:22:33 -0600
Subject: [PATCH] chore: switch to vim/vimdiff, add colour

---
 dot_config/git/config.tmpl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dot_config/git/config.tmpl b/dot_config/git/config.tmpl
index 5fb7a2c9938dcf89fbaf56ec44c1607ecc1dcec8..5aff88fedcd500cefe4a552ed773593ac4c73220 100644
--- a/dot_config/git/config.tmpl
+++ b/dot_config/git/config.tmpl
@@ -37,6 +37,7 @@
 	fsmonitor = true
 	untrackedCache = true
 	excludesFile = ~/.config/git/ignore
+	editor = vim
 [delta]
 	line-numbers = true
 	{{- if eq .theme_variant "dark" }}
@@ -76,3 +77,8 @@
 	autoStash = true
 [merge]
 	conflictstyle = zdiff3
+	tool = vimdiff
+[color]
+	ui = true
+[fetch]
+	auto = true