Breaks when used with atom-editorconfig

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

https://atom.io/packages/merge-conflicts

MIT License

431 stars 42 forks source link

Closed simon-ls closed 8 years ago

simon-ls commented 8 years ago

The conflict highlighting (and all functionality dependant upon this) does not work when the atom-editorconfig plugin is enabled.

Instead, git's default breaks are shown.

smashwilson commented 8 years ago

Duplicate of sindresorhus/atom-editorconfig#65 and #196. Please subscribe to those issues instead for updates.