mkdiff.com

外部 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.