The Stack Overflow podcast is back! Listen to an interview with our new CEO.

Ediff is a feature of Emacs which allows comparing two or more files or buffers, as well as merging two files or buffers into one.

Ediff user manual:

Ediff page on Emacs wiki:

history | excerpt history