ediff compares the text in two (or three) buffers.
| M-x ediff | Enter ediff mode |
| a | Copy file A's region to file B's. (A wins) |
| b | Copy file B's region to file A's. (B wins) |
| ? | Help |
| n | Move to next difference region |
| p | Move to previous difference region |
| ra | Restore A's region (after a b operation) |
| rb | Restore B's region (after an a operation) |
| A | Make buffer A read-only |
| B | Make buffer B read-only |
| q | Quit ediff |
ediff3
ediff-revision
emerge