Mercurial > emacs
comparison man/ediff.texi @ 44029:aa071cceb8e0
described the new "=" fiture.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Wed, 20 Mar 2002 06:41:51 +0000 |
parents | b389f29a8b00 |
children | a1448e19a9f8 |
comparison
equal
deleted
inserted
replaced
44028:182881d68883 | 44029:aa071cceb8e0 |
---|---|
892 region, so the refinement feature of Ediff will not be able to tell you | 892 region, so the refinement feature of Ediff will not be able to tell you |
893 what exactly differs inside these chunks. Since eyeballing large pieces of | 893 what exactly differs inside these chunks. Since eyeballing large pieces of |
894 text is contrary to human nature, Ediff has a special command to help | 894 text is contrary to human nature, Ediff has a special command to help |
895 reduce the risk of developing a cataract. | 895 reduce the risk of developing a cataract. |
896 | 896 |
897 The above command compares regions within Ediff buffers. This creates a | 897 In other situations, the currently highlighted region might be big and you |
898 child Ediff session for comparing current Emacs regions in buffers A, B, or | 898 might want to reconcile of them interactively. |
899 C as follows: | 899 |
900 All of this can be done with the above comand, @kbd{=}, which | |
901 compares regions within Ediff buffers. Typing @kbd{=} creates a | |
902 child Ediff session for comparing regions in buffers A, B, or | |
903 C as follows. | |
904 | |
905 First, you will be asked whether you want to compare the fine differences | |
906 between the currently highlighted buffers on a word-by-word basis. If you | |
907 accept, a child Ediff session will start using the currently highlighted | |
908 regions. Ediff will let you step over the differences word-wise. | |
909 | |
910 If you reject the offer, you will be asked to select regions of your choice. | |
900 | 911 |
901 @emph{If you are comparing 2 files or buffers:} | 912 @emph{If you are comparing 2 files or buffers:} |
902 Ediff will ask you to select regions in buffers A and B. | 913 Ediff will ask you to select regions in buffers A and B. |
903 | 914 |
904 @emph{If you are comparing 3 files or buffers simultaneously:} Ediff will | 915 @emph{If you are comparing 3 files or buffers simultaneously:} Ediff will |