Skip to content

fix: prevent flickering in 3-way conflict diff (#317) #320

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
esmuellert merged 1 commit into from
Mar 11, 2026
+116 −2

fix: prevent flickering in 3-way conflict diff (#317)

a5fcab3
Select commit
Loading
Failed to load commit list.
Merged

fix: prevent flickering in 3-way conflict diff (#317) #320

fix: prevent flickering in 3-way conflict diff (#317)
a5fcab3
Select commit
Loading
Failed to load commit list.
GitGuardian / GitGuardian Security Checks succeeded Mar 11, 2026 in 0s

No secrets detected ✅

1 commit was scanned without uncovering any secrets.

Details

Commit scanned: 1

  • Pull request #320: dev 👉 main

🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

View more details on GitGuardian