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.