3 ms·
Shout out to Emacs Ediff - it can compare files, directories, buffers (open files), regions within buffers (selected text within files, and is version control
by jacobsenscott 4y ago
Shout out to Emacs Ediff - it can compare files, directories, buffers (open files), regions within buffers (selected text within files, and is version control aware.
- Dangeranger 4y agoOnce I learned to use Ediff with Magit there was no going back. It has been consistently the quickest and easiest thing for solving complicated merges of many files in a rebase.
- onetom 4y agoAny experience with vdiff? https://github.com/justbur/emacs-vdiff https://github.com/justbur/emacs-vdiff How does it fare compared to ediff?
- jacobsenscott 4y agoNever used it. I suppose if you are fond of vimdiff, but migrating to emacs it might be nice.