Today's Emacs tool: smerge. It highlights conflicts, differences and provides smerge-keep-current to choose between. http://t.co/hyO15HKAOl
miniblog.
Related Posts
I've released difftastic 0.65! Highlights of this release:
* Better parsing of Clojure, Common Lisp, Kotlin, Rust and Zig.
* Quality of life improvements for binary files.
I've released difftastic 0.48! Highlights in this release:
* Subword highlighting in replaced strings! This is a big improvement in many situations.
* Better Scala parsing
* Better Haskell handling
There's a great playlist on YouTube that shows the highlights of Doug Engelbart's amazing tech demo from 1968: https://m.youtube.com/playlist?list=PL76DBC8D6718B8FD3
It's an integrated dev environment, hypertext system, structured text, and even allows multiuser collaboration!






