mkdiff.com

외부 diff 도구 가이드

Vimdiff

Built-in Vim diff mode for comparing files and resolving merge conflicts directly inside Vim or terminal-based editor workflows.

분류
Terminal
라이선스
Open source
플랫폼
Windows, macOS, Linux, Unix

적합한 용도

Vim users who prefer keyboard-driven review and want diff/merge capability without leaving the editor.

장점

  • Available anywhere Vim is installed
  • Keyboard-driven merge workflow
  • Works over SSH and in terminals

제한

  • Requires Vim knowledge
  • Can be confusing for first-time merge resolution
  • No media or folder comparison UI

주요 기능

Side-by-side diff windows
Diff navigation commands
Merge get/put commands
Git mergetool integration

설치 메모

Install Vim, then run: vimdiff file1 file2Git: git mergetool --tool=vimdiff