Add git conflicts shared syntax

borela / naomi

Sublime Text enhanced syntax highlighting for JavaScript ES6/ES7/ES2015/ES2016/ES2017+, Babel, FlowType, React JSX, Styled Components, HTML5, SCSS3, PHP 7, phpDoc, PHPUnit, MQL4. Basic: Git config files.

Other

558 stars 18 forks source link

Add git conflicts shared syntax #168

Closed phts closed 2 years ago

phts commented 6 years ago

I would like to add support for highlighting of git conflicts.

In native packages of Sublime text I managed to do so just to add prototype: phts/Packages@f10a67468d49725949f60ff4b821d1a0b807b555

But here in Naomi I didn't managed to do so. It seems there will be not a simple change.

In this pull request I added syntax file for git conflicts only.

Could you help me to add this syntax into JS, CSS and other supported syntaxes? (Of course if you interested in such pull request :) )

borela commented 6 years ago

I am definitely interested in adding this, this will probably only be possible after the build system is in place because then it'll combine all needed files into a single one, leave this pull request open and I'll ping you as soon as I have the build working.