Skip to content
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

Jump to bottom

Merge Editor: update background and border colors #158825

Merged
merged 5 commits into from Aug 22, 2022
Merged

Merge Editor: update background and border colors #158825

merged 5 commits into from Aug 22, 2022

Conversation

daviddossett
Copy link
Contributor

@daviddossett daviddossett commented Aug 22, 2022 •
edited

Fix #153316

CleanShot 2022-08-22 at 15 04 15@2x

CleanShot 2022-08-22 at 15 21 24@2x
CleanShot 2022-08-22 at 15 21 35@2x
CleanShot 2022-08-22 at 15 21 41@2x

@VSCodeTriageBot VSCodeTriageBot added this to the August 2022 milestone Aug 22, 2022
@daviddossett daviddossett enabled auto-merge (squash) August 22, 2022 22:25
@daviddossett daviddossett merged commit 4fd2216 into main Aug 22, 2022
@daviddossett daviddossett deleted the ddossett/leading-tarsier branch August 22, 2022 23:45
@hediet
Copy link
Member

hediet commented Aug 23, 2022

Thanks!
Did you align the colors for mergeEditor.change.word.background and mergeEditor.change.background with the diff editor?

@daviddossett daviddossett mentioned this pull request Aug 25, 2022
Merged
@github-actions github-actions bot locked and limited conversation to collaborators Oct 7, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@joyceerhl joyceerhl joyceerhl approved these changes

Assignees

@daviddossett daviddossett

Labels
merge-editor
Projects
None yet
Milestone
August 2022
Development

Successfully merging this pull request may close these issues.

Merge Editor: Tweak Colors
4 participants
@daviddossett @hediet @joyceerhl @VSCodeTriageBot