merge-conflicts Resolve git merge conflicts in Atom

授权协议：MIT License操作系统：跨平台开发语言：JavaScript

Merge Conflicts Deprecation Notice This package is deprecated and subsumed by the Git and GitHub ...