chore: switch to vim/vimdiff, add colour

Amolith created

Change summary

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

Detailed changes

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