Guía de herramienta diff externa
Vimdiff
Built-in Vim diff mode for comparing files and resolving merge conflicts directly inside Vim or terminal-based editor workflows.
Categoría
Terminal
Licencia
Open source
Plataformas
Windows, macOS, Linux, Unix
Ideal para
Vim users who prefer keyboard-driven review and want diff/merge capability without leaving the editor.
Fortalezas
- Available anywhere Vim is installed
- Keyboard-driven merge workflow
- Works over SSH and in terminals
Limitaciones
- Requires Vim knowledge
- Can be confusing for first-time merge resolution
- No media or folder comparison UI
Funciones clave
Side-by-side diff windows
Diff navigation commands
Merge get/put commands
Git mergetool integration
Notas de instalación
Install Vim, then run: vimdiff file1 file2Git: git mergetool --tool=vimdiff