move git attributes file & configure merge for go.sum

This commit is contained in:
Gabriel Augendre 2024-05-14 12:34:44 +02:00
parent aee23bbd8b
commit 962e2cea8d
2 changed files with 3 additions and 1 deletions

View file

@ -0,0 +1,2 @@
go.sum merge=union

View file

@ -53,7 +53,7 @@
enabled = true
[core]
editor = nvim
attributesfile = {{ .chezmoi.homeDir }}/.gitattributes
attributesfile = {{ .chezmoi.homeDir }}/.config/git/attributes
autocrlf = input
[submodule]
recurse = true