-- Leo's gemini proxy

-- Connecting to bbs.geminispace.org:1965...

-- Connected

-- Sending request

-- Meta line: 20 text/gemini; charset=utf-8

Comment by 🐙 norayr


Re: "Beginner tips for beautiful diffs?"

In: s/bash


and i prefer tkdiff. (:


🐙 norayr

Apr 26 · 4 weeks ago


1 Later Comment


☕️ Morgan · Apr 27 at 04:35:

vimdiff sounds like the same UI concept as kdiff3, good to know :) thanks.


Original Post


🌒 s/bash

Beginner tips for beautiful diffs? — I largely prefer command line tools, but when it comes to handling merge conflicts I find command line diff tools confusing (e.g. I'm in vimdiff and I've got these panes open - which is which?) and always end up either using a GUI git client like sublime merge to visualize the diff or dive into the file with conflicts and resolve them manually. Also, there are times when I wish to compare two files or strings. Sometimes I just make some dummy git activity to...

💬 lanterm · 5 comments · 1 like · Apr 23 · 4 weeks ago

-- Response ended

-- Page fetched on Mon May 20 18:20:11 2024