Hour 14: Finding Differences Between Files: Ediff and Version Control Systems

Sams Teach Yourself Emacs in 24 Hours

Hour 14: Finding Differences Between Files

Sections in this Hour:
Diffing Two Files with Ediff	Merging Files	Summary
Diffing Two Files with a Common Ancestor	Using Ediff with Directories of Files	Q&A
Ediff Session	Ediff and Version Control Systems	Exercises

Ediff and Version Control Systems

The Ediff library offers the functions ediff-revision and ediff-merge-revisions, which do the same thing as ediff-files and ediff-merge-files, except that one or two of the files that they need for Emacs to do its job can come from the version control system. Revision control in Emacs is covered in Hour 19, "Programming Utilities."

Tip - This is a convenient way to see what you have changed before you check in the files in the revision control system. Now you can actually write meaningful check-in messages.

Sams Teach Yourself Emacs in 24 Hours

Contents Index

Hour 14: Finding Differences Between Files

Previous Hour Next Hour

Sections in this Hour:
Diffing Two Files with Ediff	Merging Files	Summary
Diffing Two Files with a Common Ancestor	Using Ediff with Directories of Files	Q&A
Ediff Session	Ediff and Version Control Systems	Exercises