Compare file differences in Emacs Ediff

Source: Internet
Author: User
Tags diff

01-02-01) ediff-buffers/ediff-files

 

    Compares the file contents of A/b in the 2 file buffers that are currently open.    Rows with inconsistent file content (or inconsistent rows, lines, or rows) or as a diff area are highlighted.    The increment portion shown in a or b window will appear in red, and if the increment of a is replaced with the b window, the replacement increment in B will appear green. A and b windows are different when the same row or rows, a and b window will be added a white highlight background, and a window of the character color is red, and b window character color is blue (estimated green plus white background overlap, equal to blue) with the key J or n/p to move the cursor to the difference area,    The difference area will be displayed as a yellow background, at the other end of the incremental window (I can't think of any words to describe it: A window is incremented, another window is referred to), and the 1th character in the beginning of the missing line is displayed as a yellow background for comparison and easy viewing.   M-x Ediff-buffers First A/b buffer name, marked well, shown in the above window as a, the following window is shown as B Basic Operation button as follows: |    Toggle the display window to left/right (the default is up and down)?   Help window In contrast mode Q exit contrast mode V/a screen up/down (forward/backward) J move to the first difference area n/p/Next difference (fast forward to Up/Next ' diff ') </> Move cursor to beginning/end of line h highlight diff content @ auto-position cursor, move cursor to inconsistent content area (a word in the difference as highlighted) A/b in the difference line: replace the contents of A/b into b/a (copy A/b lines to b/a, which is replaced When a/b line is replaced, if the difference is only a blank area inconsistency, that is, the text content is consistent, no substitution will be made.    After replacement, you can reverse the operation, as follows RA/RB.    RA/RB the redo operation after the difference of the above line (inverse operation): RA is the replacement of the a window, and the RB is alternate and repeated (reciprocal) for the replacement and recovery in the Recovery b window. * re??????    Current difference region??????         ! Update Variance Area # # ignores whitespace characters (the auto-positioning cursor should be turned on at first @) #f/#h Show/Hide the difference area (related to the difference between whitespace characters)??????   WA/WB Saving A/b window file 

Tagged with?????? Some of the places are not clear:-)

    01-02-02) ediff-buffer3/ediff-files3    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    3方差异对比(在用到时再补上了)

Compare file differences in Emacs Ediff

Contact Us

The content source of this page is from Internet, which doesn't represent Alibaba Cloud's opinion; products and services mentioned on that page don't have any relationship with Alibaba Cloud. If the content of the page makes you feel confusing, please write us an email, we will handle the problem within 5 days after receiving your email.

If you find any instances of plagiarism from the community, please send an email to: info-contact@alibabacloud.com and provide relevant evidence. A staff member will contact you within 5 working days.

A Free Trial That Lets You Build Big!

Start building with 50+ products and up to 12 months usage for Elastic Compute Service

  • Sales Support

    1 on 1 presale consultation

  • After-Sales Support

    24/7 Technical Support 6 Free Tickets per Quarter Faster Response

  • Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.