Skip to content
TextMate bundle for highlighting merge conflict markers
Branch: master
Clone or download
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Type Name Latest commit message Commit time
Failed to load latest commit information.
Syntaxes
LICENSE.md
README.md
info.plist

README.md

TextMate Bundle for highlighting merge conflict markers

This bundle defines a simple injection grammar to highlight merge conflict markers across all filetypes.

Installation

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

Customization

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:

  • <<<<<<<comment.merge-marker.yours
  • |||||||comment.merge-marker.original
  • =======comment.merge-marker.theirs
  • >>>>>>>comment.merge-marker.end
You can’t perform that action at this time.