ediff

ediff is an alias for `ediff-files' in `ediff.el'.


(ediff FILE-A FILE-B &optional STARTUP-HOOKS)

Run Ediff on a pair of files, FILE-A and FILE-B.