Гид по внешнему diff-инструменту
TortoiseGitMerge
Windows diff and merge utility bundled with TortoiseGit for viewing differences, resolving conflicts, and applying patches.
Категория
IDE workflow
Лицензия
Open source
Платформы
Windows
Лучше всего для
Windows users who already use TortoiseGit and want shell-integrated Git diff and merge workflows.
Сильные стороны
- Excellent Windows shell workflow
- Bundled with TortoiseGit
- Good patch and conflict workflows
Ограничения
- Windows-only
- Tied to TortoiseGit habits
- Less useful outside Git/shell workflows
Ключевые функции
Diff mode
Merge conflict editing
Patch file viewing
Windows shell integration
Установка
Install TortoiseGit; TortoiseGitMerge is included.