void/dotfiles
1
0
Fork 0
Code Activity

gitconfig tmpl for ftpserver

Browse Source
This commit is contained in:
void
2025-04-07 01:17:43 +03:00
parent 8a5d87045a
commit 59a6ecdc1d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dot_gitconfig.tmpl
View File

@@ -26,4 +26,8 @@
[rebase]
updateRefs = true
[merge]
{{- if eq .chezmoi.hostname "ftpserver" }}
conflictstyle = diff3
{{- else }}
conflictstyle = zdiff3
{{ end -}}