Skip to content

Files

Latest commit

author
Igor Kotkovets
Apr 23, 2020
e37e566 · Apr 23, 2020

History

History
13 lines (11 loc) · 356 Bytes

ediff.md

File metadata and controls

13 lines (11 loc) · 356 Bytes

Ediff

a - apply changes from buffer A
b - apply changes from buffer B
d - keep both variants (A+B)
n - show next changes
p - show previous changes
r - recover the original difference region in buffer C
C-x o - change focused buffer window
v - scroll bottom
M-v - scroll up
q - end ediffing