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: new style of indicating diff? #152950

Closed
bpasero opened this issue Jun 23, 2022 · 2 comments
Closed

Merge editor: new style of indicating diff? #152950

bpasero opened this issue Jun 23, 2022 · 2 comments
Assignees
@hediet
Labels
insiders-released Patch has been released in VS Code Insiders merge-editor
Milestone
June 2022

Comments

@bpasero
Copy link
Member

bpasero commented Jun 23, 2022

I really like how I can see the word-level change per line now in the merge editor, but shouldn't the colors be identical to the diff editor?

175236745-6bf9dc00-ca8f-4ce2-88a4-f2353b30a5f5
@hediet hediet added this to the June 2022 milestone Jun 23, 2022
@hediet
Copy link
Member

hediet commented Jun 23, 2022

I agree the new color needs to be tweaked.

Would you also use the green background?

@bpasero
Copy link
Member Author

bpasero commented Jun 23, 2022

I think making this look as close as a diff editor if possible would be nice because I am so used at looking at diffs with their color coding.

//cc @daviddossett @misolori

@hediet hediet closed this as completed in 8b89630 Jun 24, 2022
@VSCodeTriageBot VSCodeTriageBot added unreleased Patch has not yet been released in VS Code Insiders insiders-released Patch has been released in VS Code Insiders and removed unreleased Patch has not yet been released in VS Code Insiders labels Jun 24, 2022
@github-actions github-actions bot locked and limited conversation to collaborators Aug 8, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@hediet hediet

Labels
insiders-released Patch has been released in VS Code Insiders merge-editor
Projects
None yet
Milestone
June 2022
Development

No branches or pull requests
3 participants
@bpasero @hediet @VSCodeTriageBot