From 59a6ecdc1d8010b21592bc493389761cbace2862 Mon Sep 17 00:00:00 2001
From: void <void.sp@gmail.com>
Date: Mon, 7 Apr 2025 01:17:43 +0300
Subject: [PATCH] gitconfig tmpl for ftpserver

---
 dot_gitconfig.tmpl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 09513c6..3924615 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -26,4 +26,8 @@
 [rebase]
 	updateRefs = true
 [merge]
+{{- if eq .chezmoi.hostname "ftpserver" }}
+	conflictstyle = diff3
+{{- else }}
 	conflictstyle = zdiff3
+{{ end -}}