Skip to content

Match Text Merge conflict list border to capture #c0c0c0 #529

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
baseGame merged 1 commit into from
Sep 25, 2026
+9 −1
Merged

Match Text Merge conflict list border to capture #c0c0c0 #529

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4843,7 +4843,7 @@ html[data-show-path-bars='0'] .path-pair-bar {
.text-merge-view .conflict-panel[data-conflict-chrome='capture-1to1-residual'] li {
min-height: 18px !important;
padding: 2px 4px !important;
border: 1px solid #d0d0d0 !important;
border: 1px solid #c0c0c0 !important;
border-radius: 0 !important;
font-size: 11px !important;
line-height: 16px !important;
Expand Down
8 changes: 8 additions & 0 deletions src/styles/textMergeChromeDensity.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,11 @@ describe('text merge path meta residual', () => {
)
})
})

describe('merge conflict li border', () => {
it('matches capture conflict list item border #c0c0c0', () => {
expect(css).toMatch(
/data-conflict-chrome='capture-1to1-residual'\] li[\s\S]*?border:\s*1px solid #c0c0c0/,
)
})
})
Loading