<div dir="ltr"><pre style="white-space:pre-wrap;color:rgb(51,51,51);font-size:13.6000003814697px;line-height:1.45;overflow:auto;font-family:Consolas,'Liberation Mono',Menlo,Courier,monospace;margin-top:0px;margin-bottom:16px;font-stretch:normal;padding:16px;border-radius:3px;word-wrap:normal"><code style="font-family:Consolas,'Liberation Mono',Menlo,Courier,monospace;font-size:13.6000003814697px;padding:0px;margin:0px;border-radius:3px;word-break:normal;border:0px;display:inline;max-width:initial;overflow:initial;line-height:inherit;word-wrap:normal;background:transparent">Whoops! that should of course read...</code></pre><pre style="white-space:pre-wrap;color:rgb(51,51,51);font-size:13.6000003814697px;line-height:1.45;overflow:auto;font-family:Consolas,'Liberation Mono',Menlo,Courier,monospace;margin-top:0px;margin-bottom:16px;font-stretch:normal;padding:16px;border-radius:3px;word-wrap:normal"><span style="font-size:13.6000003814697px;line-height:inherit;background-color:transparent">cd ~/Library/Application\ Support/Avian/Bundles</span></pre></div><div class="gmail_extra"><br><div class="gmail_quote">On 11 February 2015 at 22:33, Carpii UK <span dir="ltr"><<a href="mailto:carpii.uk@gmail.com" target="_blank">carpii.uk@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Thanks, this looks useful :-)<div><br></div><div>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...</div><div><br></div><div>Should be</div><div><br></div><div><pre style="overflow:auto;font-family:Consolas,'Liberation Mono',Menlo,Courier,monospace;font-size:13.6000003814697px;margin-top:0px;margin-bottom:16px;font-stretch:normal;line-height:1.45;padding:16px;border-radius:3px;word-wrap:normal;color:rgb(51,51,51);background-color:rgb(247,247,247)"><code style="font-family:Consolas,'Liberation Mono',Menlo,Courier,monospace;font-size:13.6000003814697px;padding:0px;margin:0px;border-radius:3px;word-break:normal;border:0px;display:inline;max-width:initial;overflow:initial;line-height:inherit;word-wrap:normal;background:transparent">cd ~/Library/Application\\ Support/Avian/Bundles</code></pre></div><div>Instead of </div><div><br></div><div><pre style="overflow:auto;font-family:Consolas,'Liberation Mono',Menlo,Courier,monospace;font-size:13.6000003814697px;margin-top:0px;margin-bottom:16px;font-stretch:normal;line-height:1.45;padding:16px;border-radius:3px;word-wrap:normal;color:rgb(51,51,51);background-color:rgb(247,247,247)"><pre style="overflow:auto;font-family:Consolas,'Liberation Mono',Menlo,Courier,monospace;font-size:13.6000003814697px;margin-top:0px;margin-bottom:16px;font-stretch:normal;line-height:1.45;padding:16px;border-radius:3px;word-wrap:normal"><code style="font-family:Consolas,'Liberation Mono',Menlo,Courier,monospace;font-size:13.6000003814697px;padding:0px;margin:0px;border-radius:3px;word-break:normal;border:0px;display:inline;max-width:initial;overflow:initial;line-height:inherit;word-wrap:normal;background:transparent">cd ~/Library/Application\\ Support/Avian/Bundles</code></pre></pre></div></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On 11 February 2015 at 10:59, Stefan Daschek <span dir="ltr"><<a href="mailto:stefan@daschek.net" target="_blank">stefan@daschek.net</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Am 11.02.15 um 08:46 schrieb Allan Odgaard:<span><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Not so much for CSS, but if TM2 supported it, it could be used to make<br>
git conflicts a lot easier to work with(ie, showing conflicts in green<br>
and red etc)<br>
</blockquote>
<br>
This can be done by an injection grammar that matches the conflict<br>
markers and scope them accordingly.<br>
<br>
I think someone has already done that, but couldn’t find the thread.<br>
</blockquote>
<br></span>
I think this was me :-) Here's the bundle:<br>
<br>
<a href="https://github.com/noniq/Merge-Markers.tmbundle" target="_blank">https://github.com/noniq/<u></u>Merge-Markers.tmbundle</a><br>
<br>
The bundle is included in the bundle index, so it can be installed by checking Preferences –> Bundles -> Merge Markers.<div><div><br>
<br>
<br>
<br>
______________________________<u></u>_________________<br>
textmate mailing list<br>
<a href="mailto:textmate@lists.macromates.com" target="_blank">textmate@lists.macromates.com</a><br>
<a href="http://lists.macromates.com/listinfo/textmate" target="_blank">http://lists.macromates.com/<u></u>listinfo/textmate</a></div></div></blockquote></div><br></div>
</div></div></blockquote></div><br></div>