vimdiff

• 두 파일의 다른점을 비교해가며 편집할 수 있다.
• 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
• Use vimdiff as git mergetool - Ruslan Osipov
• vimdiff cheat sheet
• Git and Vimdiff | by Alex R. Young | usevim | Medium

• 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.
• zo - open folded text
• zc - close folded text
• 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.

• Ctrl+Alt+Down 으로 다음 차이로 이동
• Ctrl+Alt+Up 으로 이전 차이로 이동

nnoremap <expr> <silent> <C-A-Down>   (&diff ? "]c" : ":cnext\<CR>")
nnoremap <expr> <silent> <C-A-Up> (&diff ? "[c" : ":cprev\<CR>")

• 공백 비교 피하기

:set diffopt+=iwhite