💾 Archived View for bbs.geminispace.org › u › norayr › 16380 captured on 2024-08-18 at 21:20:42. Gemini links have been rewritten to link to archived content
⬅️ Previous capture (2024-07-09)
-=-=-=-=-=-=-
Re: "Beginner tips for beautiful diffs?"
and i prefer tkdiff. (:
Apr 26 · 4 months ago
vimdiff sounds like the same UI concept as kdiff3, good to know :) thanks.
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...