DiffMerge

DiffMerge

Sourcegear
GitTree

GitTree

Kodmora
+
+

Related Products

  • PDF Guru
    4.3 out of 5 stars 106,163 Ratings
    Visit Website for PDF Guru
  • Label LIVE
    4.9 out of 5 stars 186 Ratings
    Visit Website for Label LIVE
  • Files.com
    4.6 out of 5 stars 338 Ratings
    Visit Website for Files.com
  • CirrusPrint
    5.0 out of 5 stars 2 Ratings
    Visit Website for CirrusPrint
  • MobiPDF
    4.6 out of 5 stars 8,243 Ratings
    Visit Website for MobiPDF
  • pCloud Business
    4.3 out of 5 stars 189 Ratings
    Visit Website for pCloud Business
  • Globalscape Enhanced File Transfer (EFT)
    4.6 out of 5 stars 109 Ratings
    Visit Website for Globalscape Enhanced File Transfer (EFT)
  • Filerev
    5.0 out of 5 stars 3 Ratings
    Visit Website for Filerev
  • Thinfinity Workspace
    4.7 out of 5 stars 16 Ratings
    Visit Website for Thinfinity Workspace
  • ManageEngine Endpoint Central
    4.6 out of 5 stars 3,409 Ratings
    Visit Website for ManageEngine Endpoint Central

About

DiffMerge is an application to visually compare and merge files on Windows, OS X and Linux. Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing. Graphically shows the changes between 3 files. Allows automatic merging (when safe to do so) and full control over editing the resulting file. Performs a side-by-side comparison of 2 folders, showing which files are only present in one file or the other, as well as file pairs which are identical or different. Right-click on any two files in Windows Explorer to diff them immediately. Rulesets and options provide for customized appearance and behavior. Identical feature set on Windows, OS X, and Linux. Graphically shows the changes between two files. Includes intra-line highlighting and full support for editing. DiffMerge is a UNICODE-based application and can import files in a wide range of character encodings.

About

GitTree is a desktop graphical Git client for developers on macOS, Windows or Linux. Its commit graph, diff viewer and file-, hunk- and line-level staging support commits; branch tools include merge, interactive rebase, conflict resolution, undo, stash, worktrees, submodules and Git LFS. Worktree cards show branches and changes; Resume and Attention help users return to checkouts and spot blocked work. Lost & Found helps recover commits with no branch reference, What Changed compares branch states across history changes, and local secret warnings flag possible credentials before commit or push. The Free plan includes local Git features for private and commercial repositories. Pro adds connected GitHub, GitLab, Bitbucket and Azure DevOps accounts for pull requests and CI/CD, plus Repo Insights, AI drafting and Nour, which works with a coding-agent CLI installed by the user.

Platforms Supported

Windows Supported
Mac Supported
Linux Supported
Cloud Not Supported
On-Premises Not Supported
iPhone Not Supported
iPad Not Supported
Android Not Supported
Chromebook Not Supported

Platforms Supported

Windows Supported
Mac Supported
Linux Supported
Cloud Not Supported
On-Premises Not Supported
iPhone Not Supported
iPad Not Supported
Android Not Supported
Chromebook Not Supported

Audience

Individuals requiring a software solution to visually compare and merge files

Audience

Developers and software teams who work with Git on macOS, Windows or Linux

Support

Phone Support Supported
24/7 Live Support Not Supported
Online Supported

Support

Phone Support Not Supported
24/7 Live Support Not Supported
Online Supported

API

Offers API Not Supported

API

Offers API Not Supported

Screenshots and Videos

Screenshots and Videos

Pricing

No information available.
Free Version Supported
Free Trial Not Supported

Pricing

$0
The Free plan includes every local Git feature, private repositories, and commercial use. Pro is $2/user/month and adds hosting integrations, CI/CD, Nour, AI drafting, and Repo Insights. Pro for organizations is $2/seat/month, with a three-seat minimum. A one-time 30-day Pro trial is available without a credit card.
Free Version Supported
Free Trial Supported

Reviews/Ratings

Overall 0.0 / 5
ease 0.0 / 5
features 0.0 / 5
design 0.0 / 5
support 0.0 / 5

This software hasn't been reviewed yet. Be the first to provide a review:

Review this Software

Reviews/Ratings

Overall 0.0 / 5
ease 0.0 / 5
features 0.0 / 5
design 0.0 / 5
support 0.0 / 5

This software hasn't been reviewed yet. Be the first to provide a review:

Review this Software

Training

Documentation Supported
Webinars Not Supported
Live Online Not Supported
In Person Supported

Training

Documentation Supported
Webinars Not Supported
Live Online Not Supported
In Person Not Supported

Company Information

Sourcegear
United States
sourcegear.com/diffmerge/index.html

Company Information

Kodmora
Egypt
gittree.app

Alternatives

NextDiff

NextDiff

TkoSoft

Alternatives

TortoiseMerge

TortoiseMerge

TortoiseSVN
Glint

Glint

Logic Over Snacks Ltd.
Compare It!

Compare It!

Grig Software

Categories

Categories

Git GUI Clients Supported
Version Control Supported

Integrations

Azure DevOps Not Supported
Bitbucket Not Supported
Claude Code Not Supported
Codex CLI Not Supported
Gemini CLI Not Supported
GitHub Not Supported
GitLab Not Supported
OpenCode Not Supported
Qwen Code Not Supported

Integrations

Azure DevOps Supported
Bitbucket Supported
Claude Code Supported
Codex CLI Supported
Gemini CLI Supported
GitHub Supported
GitLab Supported
OpenCode Supported
Qwen Code Supported
Claim DiffMerge and update features and information
Claim DiffMerge and update features and information
Claim GitTree and update features and information
Claim GitTree and update features and information