[TxMt] Re: Color Highlight?

[Carpii UK]

Whoops! that should of course read...

cd ~/Library/Application\ Support/Avian/Bundles


On 11 February 2015 at 22:33, Carpii UK <carpii.uk at gmail.com> wrote:

> Thanks, this looks useful :-)
>
> Ive installed it but not had a conflict I can test it with yet. Just a
> minor note, your github instructions have a spurious backslash...
>
> Should be
>
> cd ~/Library/Application\\ Support/Avian/Bundles
>
> Instead of
>
> cd ~/Library/Application\\ Support/Avian/Bundles
>
>
> On 11 February 2015 at 10:59, Stefan Daschek <stefan at daschek.net> wrote:
>
>> Am 11.02.15 um 08:46 schrieb Allan Odgaard:
>>
>>> Not so much for CSS, but if TM2 supported it, it could be used to make
>>>> git conflicts a lot easier to work with(ie, showing conflicts in green
>>>> and red etc)
>>>>
>>>
>>> This can be done by an injection grammar that matches the conflict
>>> markers and scope them accordingly.
>>>
>>> I think someone has already done that, but couldn’t find the thread.
>>>
>>
>> I think this was me :-) Here's the bundle:
>>
>> https://github.com/noniq/Merge-Markers.tmbundle
>>
>> The bundle is included in the bundle index, so it can be installed by
>> checking Preferences –> Bundles -> Merge Markers.
>>
>>
>>
>>
>> _______________________________________________
>> textmate mailing list
>> textmate at lists.macromates.com
>> http://lists.macromates.com/listinfo/textmate
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macromates.com/textmate/attachments/20150211/c5146749/attachment-0001.html>