External diff tool guide
TortoiseGitMerge
Windows diff and merge utility bundled with TortoiseGit for viewing differences, resolving conflicts, and applying patches.
Category
IDE workflow
License
Open source
Platforms
Windows
Best for
Windows users who already use TortoiseGit and want shell-integrated Git diff and merge workflows.
Strengths
- Excellent Windows shell workflow
- Bundled with TortoiseGit
- Good patch and conflict workflows
Limitations
- Windows-only
- Tied to TortoiseGit habits
- Less useful outside Git/shell workflows
Key features
Diff mode
Merge conflict editing
Patch file viewing
Windows shell integration
Install notes
Install TortoiseGit; TortoiseGitMerge is included.