External diff tool guide
Vimdiff
Built-in Vim diff mode for comparing files and resolving merge conflicts directly inside Vim or terminal-based editor workflows.
Category
Terminal
License
Open source
Platforms
Windows, macOS, Linux, Unix
Best for
Vim users who prefer keyboard-driven review and want diff/merge capability without leaving the editor.
Strengths
- Available anywhere Vim is installed
- Keyboard-driven merge workflow
- Works over SSH and in terminals
Limitations
- Requires Vim knowledge
- Can be confusing for first-time merge resolution
- No media or folder comparison UI
Key features
Side-by-side diff windows
Diff navigation commands
Merge get/put commands
Git mergetool integration
Install notes
Install Vim, then run: vimdiff file1 file2Git: git mergetool --tool=vimdiff