GitHub repository: smashwilson/merge-conflicts
Primary language: CoffeeScript
Description: Resolve git merge conflicts in Atom