data0<p>Since y'all liked 🔀🦒 <a href="https://indieweb.social/tags/Mergiraf" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>Mergiraf</span></a> so much (a syntax-aware <a href="https://indieweb.social/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>git</span></a> <a href="https://indieweb.social/tags/merge" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>merge</span></a> driver that solves many conflicts automatically that git's built-in merge strategies can't), go check out ≏🤩 <a href="https://indieweb.social/tags/Difftastic" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>Difftastic</span></a> too! It's a syntax-aware <a href="https://indieweb.social/tags/diff" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>diff</span></a> tool that produces finer grained, much easier to read output than classic <a href="https://indieweb.social/tags/GNU" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>GNU</span></a> <a href="https://indieweb.social/tags/diffutils" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>diffutils</span></a> or <a href="https://indieweb.social/tags/BSD" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>BSD</span></a> diff. No more decoding "@@ -5,6 +5,7 @@"! Integrates nicely with <a href="https://indieweb.social/tags/git" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>git</span></a> as well.</p><p><a href="https://difftastic.wilfred.me.uk/" rel="nofollow noopener noreferrer" translate="no" target="_blank"><span class="invisible">https://</span><span class="">difftastic.wilfred.me.uk/</span><span class="invisible"></span></a></p><p><a href="https://indieweb.social/tags/opensource" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>opensource</span></a> <a href="https://indieweb.social/tags/coding" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>coding</span></a> <a href="https://indieweb.social/tags/programming" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>programming</span></a> <a href="https://indieweb.social/tags/cvs" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>cvs</span></a> <a href="https://indieweb.social/tags/difftool" class="mention hashtag" rel="nofollow noopener noreferrer" target="_blank">#<span>difftool</span></a></p>