Skip to content

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

Merged
vaintrub merged 1 commit into
masterfrom
fix/gitconfig-zdiff3-version-gate
May 31, 2026
Merged

fix(git): gate merge.conflictStyle zdiff3 on git >= 2.35#35
vaintrub merged 1 commit into
masterfrom
fix/gitconfig-zdiff3-version-gate

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

16a1d7e
Select commit
Loading
Failed to load commit list.
Sign in for the full log view

Annotations

1 warning
unit tests (lib/install-packages.sh)
succeeded May 31, 2026 in 19s