ediff Mode
What's the Diff?
There is a rich set of tools under Emacs for comparing files and
directories and merging changes. It is called ediff and
is located under the "tools/compare" menu item. Kiss manual
merging goodbye!
Merging Two Files
To check the differences between two files and merge changes, follow
these simple steps:
- run the command "
ediff-files"
- enter filename of file
A
- enter filename of file
B
- don't touch your mouse (it will be moved automatically to give
focus to a new window)
- enter one or more of the following commands:
- "
n" (or space bar) to go to the next difference
- "
p" to go to the previous difference
- "
a" merge the difference of file
A into file B
- "
b" merge the difference of file
B into file A
- "
wa" write changes in file A
to disk
- "
wb" write changes in file B
to disk
- "
q" to quit
Beginning |
Previous |
Next
Last updated $Date: 1997/04/11 03:46:08 $.