사용자 도구

사이트 도구


vim:vimdiff

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.
  • 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>")
vim/vimdiff.txt · 마지막으로 수정됨: 2020/09/16 13:18 저자 kwon37xi