Skip to content

Match Text Merge conflict panel fill to capture #f0f0f0 - #528

Merged
baseGame merged 1 commit into
masterfrom
ui-1to1-merge-conflict-f0
Sep 25, 2026
Merged

baseGame merged 1 commit into
masterfrom
ui-1to1-merge-conflict-f0

Conversation

@baseGame

Copy link
Copy Markdown
Collaborator

Summary

  • Match Text Merge conflict panel fill to capture #f0f0f0.
  • Sync densify locks for the conflict panel fill.

Test plan

  • textMergeChromeDensity unit test

@baseGame
baseGame merged commit 95aed84 into master Sep 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant