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

Add: Merge conflicts #6

Open
10 tasks
dumb opened this issue Jan 17, 2020 · 0 comments
Open
10 tasks

Add: Merge conflicts #6

dumb opened this issue Jan 17, 2020 · 0 comments
Assignees
@dumb
Labels
enhancement New feature or request
Milestone
2am v1.0.0 - Core

Comments

@dumb
Copy link
Contributor

dumb commented Jan 17, 2020

Add definitions for merge conflict stuff

  • merge.currentHeaderBackground
  • merge.currentContentBackground
  • merge.incomingHeaderBackground
  • merge.incomingContentBackground
  • merge.border
  • merge.commonContentBackground
  • merge.commonHeaderBackground
  • editorOverviewRuler.currentContentForeground
  • editorOverviewRuler.incomingContentForeground
  • editorOverviewRuler.commonContentForeground
@dumb dumb added the enhancement New feature or request label Jan 17, 2020
@dumb dumb added this to the 33p Dark v1.0.0 milestone Jan 17, 2020
@dumb dumb self-assigned this Jan 17, 2020
@dumb dumb changed the title Merge conflicts Add: Merge conflicts Jan 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@dumb dumb

Labels
enhancement New feature or request
Projects
None yet
Milestone
2am v1.0.0 - Core
Development

No branches or pull requests
1 participant
@dumb