TextMate Bundle for highlighting merge conflict markers
This bundle defines a simple injection grammar to highlight merge conflict markers across all filetypes.
The bundle is included in TextMate's bundle index, so just go to Preferences → Bundles and make sure “Merge Markers” is selected.
If you want to install the bundle manually, use the following:
cd ~/Library/Application\ Support/Avian/Bundles git clone https://github.com/noniq/Merge-Markers.tmbundle
Lines containing a merge marker will get the scope
comment.merge-marker applied, so they will be styled like comments out of the box. To customize their appearance just edit your theme to include specific highlighting settings for
comment.merge-marker or the following, even more specific scopes: