Ediff
From Wikipedia, the free encyclopedia
Ediff is a tool available in Emacs for interactively creating and applying diff files without ever having to see their contents. Written in Emacs Lisp by Michael Kifer, the program is free software and was based on the capabilities of Emerge -- a similar tool that interactively merges two or more modified files.