May 24, 2021 Vim
Vim brings its own file difference editor (a program that displays differences between multiple files and can easily merge them). S
tart it with the words "vimdiff" - just specify a few pairs of files:
vimdiff _file1_ _file2_
The following
is a list of vimdiff-specific
commands.
| Behavior | Shortcuts |
|---|---|
| The next difference |
]c
|
| The difference |
[
c
|
| Difference import |
do
|
| Difference export |
dp
|
| Turn on folding |
zo
|
| Turn off folding |
zc
|
| Rescan the file |
:diffupdate
|
| The window switches |
Ctrl+w+w
|