[filter "lfs"] required = true clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process [user] name = markcam1 email = 32405690+markcam1@users.noreply.github.com [push] default = upstream [merge] conflictstyle = diff3 [alias] co = checkout [core] autocrlf = input safecrlf = false [merge] tool = kdiff3 [mergetool "kdiff3"] path = C:/Program Files/KDiff3/kdiff3.exe trustExitCode = false [diff] guitool = kdiff3 [difftool "kdiff3"] path = C:/Program Files/KDiff3/kdiff3.exe trustExitCode = false