外部 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