Vimdiff
Usage
vimdiff file1 file2 [file3]
vim -d file1 file2 [file3]
Editing
:[range]diffget [bufspec]
:[range]diffput [bufspec]
| Shortcut |
Description |
do / :diffget |
Obtain (get) difference |
dp / :diffput |
Put difference |
:dif |
Re-scan differences |
:diffo |
Switch off diff mode |
:1,$+1diffget |
Get all differences |
ZQ |
Quit without changes |
Folds
| Shortcut |
Description |
zo / zO |
Open |
zc / zC |
Close |
za / zA |
Toggle |
zv |
Open folds for this line |
zM |
Close all |
zR |
Open all |
zm |
Fold more (foldlevel += 1) |
zr |
Fold less (foldlevel -= 1) |
zx |
Update folds |
Jumping
| Shortcut |
Description |
]c |
Next difference |
[c |
Previous difference |