In this ~15 minute video, I show how to inspect the differences between two or three files in a side-by-side comparison. Ediff lets you merge changes from on...
  • 00-11@alien.topBEnglish
    1·
    10 months ago

    Also very basic, IMO:

    • g X - go to buffer X’s point
    • j - jump to diff number (prefix arg)
    • ! - update (re-diff)
    • C-l - recenter
    • * - refine current region
    • ## - ignore whitespace diffs
    • 7890yuiop@alien.topBEnglish
      1·
      10 months ago

      And in case the video doesn’t say it:

      Ediff has its own user manual: C-h i g (ediff)