Remove old gitconfig template condition · f64560f80d - dotfiles - void git

void/dotfiles

Remove old gitconfig template condition

This commit is contained in:

void

2026-03-25 12:20:23 +03:00

parent c9ff8e4e31

commit f64560f80d

1 changed files with 0 additions and 4 deletions

									
										dot_gitconfig.tmpl
									
		-4
	
												View File
												
					@@ -26,8 +26,4 @@

					[rebase]

					[rebase]

						updateRefs = true

						updateRefs = true

					[merge]

					[merge]

					{{- if eq .chezmoi.hostname "ftpserver" }}

						conflictstyle = diff3

					{{- else }}

						conflictstyle = zdiff3

						conflictstyle = zdiff3

					{{ end }}