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.