mkdiff.com

Guide d’outil diff externe

TortoiseGitMerge

Windows diff and merge utility bundled with TortoiseGit for viewing differences, resolving conflicts, and applying patches.

Catégorie
IDE workflow
Licence
Open source
Plateformes
Windows

Idéal pour

Windows users who already use TortoiseGit and want shell-integrated Git diff and merge workflows.

Points forts

  • Excellent Windows shell workflow
  • Bundled with TortoiseGit
  • Good patch and conflict workflows

Limites

  • Windows-only
  • Tied to TortoiseGit habits
  • Less useful outside Git/shell workflows

Fonctions clés

Diff mode
Merge conflict editing
Patch file viewing
Windows shell integration

Notes d’installation

Install TortoiseGit; TortoiseGitMerge is included.