[Common] Add git conflict marker highlighting#4047
Open
deathaxe wants to merge 17 commits intosublimehq:masterfrom deathaxe:pr/common/git-conflict-markers
+2,275-5
Commits
Commits on Sep 29, 2024
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Oct 4, 2024
Commits on Oct 5, 2024
Commits on Oct 25, 2024
- committed
- committed
- committed
- committed
- committed
- committed
- committed