vim:vimdiff

차이

문서의 선택한 두 판 사이의 차이를 보여줍니다.

차이 보기로 링크

--- vim:vimdiff [2020/09/16 13:14]
kwon37xi
+++ vim:vimdiff [2021/02/17 23:51] (현재)
kwon37xi
@@ 줄 5: / 줄 5: @@
   * [[http://technotales.wordpress.com/2009/05/17/git-diff-with-vimdiff/|Git Diff with Vimdiff]]
   * [[https://goodtogreate.tistory.com/entry/git-difftool-%EC%82%AC%EC%9A%A9%EB%B2%95|git difftool 사용법 vimdiff]]
+  * [[https://www.rosipov.com/blog/use-vimdiff-as-git-mergetool/|Use vimdiff as git mergetool - Ruslan Osipov]]
+  * [[https://gist.github.com/mattratleph/4026987|vimdiff cheat sheet]]
+  * [[https://medium.com/usevim/git-and-vimdiff-a762d72ced86|Git and Vimdiff | by Alex R. Young | usevim | Medium]]
 ===== 사용법 =====
@@ 줄 11: / 줄 14: @@
   * '']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'' 으로 이전 차이로 이동
+<code>
+nnoremap <expr> <silent> <C-A-Down>   (&diff ? "]c" : ":cnext\<CR>")
+nnoremap <expr> <silent> <C-A-Up> (&diff ? "[c" : ":cprev\<CR>")
+</code>
+  * 공백 비교 피하기
+<code>
+:set diffopt+=iwhite
+</code>

vim/vimdiff.1600229675.txt.gz · 마지막으로 수정됨: 2020/09/16 13:14 저자 kwon37xi