0:00 / 0:00
- Recommended by 2 people: 2 in engineering communities.
- Presented by Protesilaos Stavrou
Beginner. No background in the topic needed.
12K views2 years ago2 recommendations
Tools and practiceVim, Emacs and editorsGit and version control
Protesilaos Stavrou explains how to use Ediff in Emacs to compare and merge differences between files.
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.): protesilaos.comWhy it's here
2 people recommend thisWhat people say. Recommended as an excellent tutorial on using Ediff for file comparison in Emacs.
u/Mindless_Swimmer1751in r/emacs • Recommends
Ediff question
I’ve watched the excellent YouTube video tutorial on ediff-buffers. link to this video
Got a couple q’s though:
- When I invoke ediff-buffers the control panel for ediff pops up in a separate os window rather than a split pane in my same emacs window. Can anybody suggest a way to make it look more like what the video shows?
- Is there a way to automatically have it ediff the two currently viewed buffers? (Rather than my having to explicitly specify them?) what I prefer to do is visit buffer A, split with c-x 2, visit buffer B in the bottom half. Then I just want to invoke ediff on those two visible buffers in one keystroke.
All tips highly appreciated!