search

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432 stars 42 forks source link

Fix selection highlight display #181

Closed antcodd closed 8 years ago

antcodd commented 8 years ago

Use transparency instead of mix() to allow selection to show through. Reduce intensity slightly for better visibility.

smashwilson commented 8 years ago

Cool, thanks!

smashwilson commented 8 years ago

Shipped as v1.3.6... I think.

$ apm publish patch
Preparing and tagging a new version ✓
Pushing v1.3.6 tag ✓
Publishing merge-conflicts@v1.3.6 ✗
socket hang up
$ apm publish --tag v1.3.6
Publishing merge-conflicts@v1.3.6 ✗
Creating new version failed: Version exists
$ apm update
Request for package information failed: socket hang up

It looks like atom.io is having some problems right now, probably related to the S3 outage. Once things are stable again, I'll make sure this went out properly.