Guide d’outil diff externe
Vimdiff
Built-in Vim diff mode for comparing files and resolving merge conflicts directly inside Vim or terminal-based editor workflows.
Catégorie
Terminal
Licence
Open source
Plateformes
Windows, macOS, Linux, Unix
Idéal pour
Vim users who prefer keyboard-driven review and want diff/merge capability without leaving the editor.
Points forts
- Available anywhere Vim is installed
- Keyboard-driven merge workflow
- Works over SSH and in terminals
Limites
- Requires Vim knowledge
- Can be confusing for first-time merge resolution
- No media or folder comparison UI
Fonctions clés
Side-by-side diff windows
Diff navigation commands
Merge get/put commands
Git mergetool integration
Notes d’installation
Install Vim, then run: vimdiff file1 file2Git: git mergetool --tool=vimdiff