search

smashwilson / merge-conflicts

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

Code editor overlay #226

Closed tn closed 8 years ago

tn commented 8 years ago

Theme & syntax: one light

screen shot 2016-04-18 at 12 52 06
smashwilson commented 8 years ago

This is a duplicate of #188. Please subscribe there for updates. :bow: