From 57c53f47aca3084159ff71071ae0010cbc521174 Mon Sep 17 00:00:00 2001
From: Alex Kelly <alex.kelly@franklin.edu>
Date: Fri, 16 Feb 2024 20:48:17 -0500
Subject: [PATCH] change diff3 to zdiff3

---
 dot_gitconfig.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 6cd52ea..b996e98 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -51,4 +51,4 @@
 [help]
 	autocorrect = 20
 [merge]
-	conflictstyle = diff3
+	conflictstyle = zdiff3