candifloss/dotfiles_bat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Styles for Merge Conflicts

Browse Source
This commit is contained in:
Candifloss 2026-07-23 14:35:56 +05:30
parent 595401ec47
commit 08f720e76a
1 changed files with 88 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
themes/candy_json/candy_json.tmTheme
View File

@ -623,6 +623,94 @@
</dict>
</dict>
<!-- ___ Rule 31: Conflict Begin _____________________________ -->
<dict>
<key>name</key>
<string>Conflict Begin</string>
<key>scope</key>
<string>
meta.block.conflict.begin.diff,
punctuation.section.block.begin.diff
</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#FF6188</string>
<key>fontStyle</key>
<string>bold</string>
</dict>
</dict>
<!-- ___ Rule 32: Conflict Separator _________________________ -->
<dict>
<key>name</key>
<string>Conflict Separator</string>
<key>scope</key>
<string>
meta.block.conflict.separator.diff,
punctuation.section.block.diff
</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#FFD866</string>
<key>fontStyle</key>
<string>bold</string>
</dict>
</dict>
<!-- ___ Rule 33: Conflict End _______________________________ -->
<dict>
<key>name</key>
<string>Conflict End</string>
<key>scope</key>
<string>
meta.block.conflict.end.diff,
punctuation.section.block.end.diff
</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#A9DC76</string>
<key>fontStyle</key>
<string>bold</string>
</dict>
</dict>
<!-- ___ Rule 34: Branch Name ________________________________ -->
<dict>
<key>name</key>
<string>Branch Name</string>
<key>scope</key>
<string>entity.name.section.diff</string>
<key>settings</key>
<dict>
<key>foreground</key>
<string>#78DCE8</string>
<key>fontStyle</key>
<string>bold</string>
</dict>
</dict>
</array>
</dict>