deathaxe
deathaxe
How about adding support for normal output?
Well, I'd probably start with normal output mode. I have no strong meaning about scope names - just explained their origin. With a look at Diff we could also use...
I'll revisit this PR once #4111 is merged.
Rebased branch and tweaked syntaxes to use _Diff/Diff.sublime-syntax#conflict-markers_. Yet question remains, whether it is a good idea to create such massive cross package depenedency.
> I also thought I saw a Git Formats tmPreferences file Yeah, I can always look at PRs for hours and a second after hitting push, I find something.
With regards to how shebang is implemented, I tend to think conflict marker contexts should also be implemented individually for each syntax to avoid cross-package dependencies, especially as Diff is...
If someone finds unhandled multi-line strings in a syntax, feel free to report it. Otherwise with dependencies to Diff.sublime-syntax being removed, this PR should be ready.
Folding would only make sense if ours/theirs/base parts could be folded individually. With `base` part being optional syntax, a begin/end may be missing, causing everything being folded. It's also not...
FWIW, it even makes a difference in Sublime Merge... 