17 нояб. 2023 г.
In this ~15 minute video, I show how to inspect the differences between two or three files in a side-by-side comparison. Ediff lets you merge changes from one file to another while retaining all the text editing capabilities of Emacs (e.g. further edit the buffer and/or undo changes).
* * *
Find all my publications on my website (Emacs, philosophy, etc.):
7 views
817
350
4 months ago 00:15:48 7
Emacs: ediff basics
4 months ago 00:13:48 1
Emacs: resolve Git conflicts with SMERGE and EDIFF
1 year ago 00:27:05 43
Изучаем Emacs. Эпизод 09_ ediff, magit, psvn и emacs -daemon