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.
