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