mkdiff.com

TortoiseGit/Merge

Visual diff/merge tool for Windows. Integrated with Git via Windows Explorer.

Open SourceInterface Graphique
Windows⭐⭐Free (GPL v2)
Visiter le site webRetour aux autres outils diff

Description

TortoiseGitMerge is the diff and merge tool included with TortoiseGit, a Windows Explorer extension for Git. It provides visual diff and merge capabilities tightly integrated with the Windows shell, making it convenient for Windows users who prefer GUI-based version control.

Caractéristiques principales

  • Visual diff and merge interface
  • Tight Git integration
  • Windows Explorer context menu integration
  • Blame display (annotate file)
  • Free and open source
  • Syntax highlighting
  • Patch file support
  • Drag and drop support

Installation

# Download from official website
# https://tortoisegit.org/download/

# Or using Chocolatey
choco install tortoisegit

Utilisation

# Right-click in Windows Explorer to access TortoiseGit
# Select "Diff" or "Merge" from context menu

# Command line (TortoiseGitMerge.exe)
TortoiseGitMerge.exe file1.txt file2.txt

# Use as Git mergetool
git config --global merge.tool tortoisemerge

Avantages

  • +Free and open source
  • +Excellent Windows integration
  • +Easy to use for Git beginners
  • +Good merge capabilities
  • +Shell integration

Inconvénients

  • -Windows only
  • -Requires TortoiseGit installation
  • -Can be slow with large repositories
  • -Limited customization

Informations rapides

Type
Open Source
Plateformes
Windows
Tarification
Free (GPL v2)
Catégorie
Interface Graphique
Popularité
⭐⭐

Alternatives

  • WinMerge
  • Beyond Compare
  • KDiff3

Outils associés

diff-so-fancy
Good-lookin' diffs. A tool that makes your diffs human-readable instead of machine-readable.
Meld
Visual diff and merge tool for developers. Compare files, directories, and version controlled projects.
Beyond Compare
Professional multi-platform utility for comparing files, folders, FTP sites, and archives.
KDiff3
Free diff and merge program for comparing or merging two or three files/directories.
Retour aux autres outils diff