문서의 이전 판입니다!
vimdiff file1 file2 …' 혹은
vim -d file1 file2… 명령으로 실행
* vimdiff – Edit two or Three versions of a file with Vim and show differences
* Git Diff with Vimdiff
* git difftool 사용법 vimdiff
===== 사용법 =====
*
do - Get changes from other window into the current window.
*
dp - Put the changes from current window into the other window.
*
]c - Jump to the next change.
*
[c - Jump to the previous change.
*
Ctrl W + Ctrl W - Switch to the other split window.
* If you load up two files in splits (:vs or :sp), you can do
:diffthis on each window and achieve a diff of files that were already loaded in buffers
*
:diffoff'' can be used to turn off the diff mode.