News for hackers. Stuff that matters.
Re:Ask HN: What is your favorite tool to resolve Git merge c... by ctenb on Wednesday July 12, 2023 @11:40AM (#36696221)
I've used kdiff3 a lot on windows. It's not bad, shows a readable 3-way-diff format (which I need to stretch over two screens to read the full lines). Reasonably fast startup too. But it lacks any sort of advanced editing functionality, such as undo.

There are no comments on this comment yet.