https://wikemacs.org/index.php?action=history&feed=atom&title=Ediff 2026-04-21T15:01:04Z Revision history for this page on the wiki MediaWiki 1.35.14 https://wikemacs.org/index.php?title=Ediff&diff=3580&oldid=prev 2012-11-06T07:02:16Z

<p>ediff</p> <p><b>New page</b></p><div>Ediff makes patching easier:<br /> <br /> * Never read that diff output again!<br /> * Apply patch interactively!<br /> * Merge with ease!<br /> <br /> This package provides a convenient way of simultaneous browsing through<br /> the differences between a pair (or a triple) of files or buffers. The<br /> files being compared, file-A, file-B, and file-C (if applicable) are<br /> shown in separate windows (side by side, one above the other or in<br /> separate frames) and the differences are highlighted as you step<br /> through them. You can also copy difference regions from one buffer to<br /> another (and recover old differences if you change your mind).<br /> <br /> Ediff also supports merging operations on files and buffers, including<br /> merging using ancestor versions. Both comparison and merging operations can<br /> be performed on directories, i.e. by pairwise comparison of files in those<br /> directories.<br /> <br /> In addition Ediff can apply a patch to a file and then let you step<br /> through both files, the patched and the original one, simultaneously,<br /> difference-by-difference. You can even apply a patch right out of a<br /> mail buffer, i.e. patches received by mail don't even have to be saved.<br /> Since Ediff lets you copy differences between buffers, you can, in<br /> effect, apply patches selectively (i.e. you can copy a difference<br /> region from file_orig to file, thereby undoing any particular patch that<br /> you don't like).</div>

Xfq