Vimdiff
lastmod 2019-12-26created 2019-12-261 edits
Compares two files with vim.
Simple usage
-
Ctrl + w + w - The command to move from one split window to another.
-
] + c - Searches downward from the current position to find a difference.
-
[ + c - Searches upward from the current position to find a difference.
-
d + o - Copies the content of the opposite window into the current position.
-
d + p - Copies the content at the current position to the opposite window.
-
z + oorz + space - Unfold identical sections.
-
z + c - Fold identical sections.
-
:diffupdate - Compares again and shows the differences. While editing the content of one window, the markers showing differences can sometimes disappear.