Skip to content

fix(git): gate merge.conflictStyle zdiff3 on git >= 2.35 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vaintrub merged 1 commit into from
May 31, 2026
Merged

fix(git): gate merge.conflictStyle zdiff3 on git >= 2.35 #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions dot_gitconfig.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,14 @@
autoSetupRemote = true

[merge]
{{- $gitVersion := output "git" "--version" | regexFind "[0-9]+\\.[0-9]+\\.[0-9]+" }}
# zdiff3 (zealous diff3) needs git >= 2.35; older git (e.g. Ubuntu jammy
# 2.34) errors "unknown style 'zdiff3'" on checkout/merge. diff3 elsewhere.
{{- if semverCompare ">=2.35.0" $gitVersion }}
conflictStyle = zdiff3
{{- else }}
conflictStyle = diff3
{{- end }}

[rebase]
autoSquash = true
Expand Down
Loading