DiffMerge

DiffMerge

Sourcegear
Glint

Glint

Logic Over Snacks Ltd.
+
+

Related Products

  • PDFCreator
    494 Ratings
    Visit Website
  • MobiPDF (formerly PDF Extra)
    5,392 Ratings
    Visit Website
  • Netwrix Auditor
    297 Ratings
    Visit Website
  • CirrusPrint
    2 Ratings
    Visit Website
  • Thinfinity Workspace
    14 Ratings
    Visit Website
  • Label LIVE
    166 Ratings
    Visit Website
  • Globalscape Enhanced File Transfer (EFT)
    84 Ratings
    Visit Website
  • Comet Backup
    224 Ratings
    Visit Website
  • Teleprompter.com
    3 Ratings
    Visit Website
  • JS7 JobScheduler
    1 Rating
    Visit Website

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

Manage your Git repositories in an easier and more visual way. Features: - A graph showing branches, commits, and where merges have happened in an easy to digest visual format - Perform merges and resolve conflicts with a 4-way diff editor - Manage multiple merges at once, without affecting the files on disk or needing to switch branch - Search commits and files in your repository history - Integrate with GitHub, GitLab, and Bitbucket to easily clone or create repositories - Squash commits together - Insert new commits in the middle - Move individual changes from one commit to another - Edit commit messages - Undo/redo

Platforms Supported

Windows
Mac
Linux
Cloud
On-Premises
iPhone
iPad
Android
Chromebook

Platforms Supported

Windows
Mac
Linux
Cloud
On-Premises
iPhone
iPad
Android
Chromebook

Audience

Individuals requiring a software solution to visually compare and merge files

Audience

Developers looking for a graphical interface for Git for Windows, macOS, or Linux

Support

Phone Support
24/7 Live Support
Online

Support

Phone Support
24/7 Live Support
Online

API

Offers API

API

Offers API

Screenshots and Videos

Screenshots and Videos

Pricing

No information available.
Free Version
Free Trial

Pricing

$0
Free Version
Free Trial

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
Webinars
Live Online
In Person

Training

Documentation
Webinars
Live Online
In Person

Company Information

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

Company Information

Logic Over Snacks Ltd.
United Kingdom
glint.info

Alternatives

TortoiseMerge

TortoiseMerge

TortoiseSVN

Alternatives

Compare It!

Compare It!

Grig Software
SmartGit

SmartGit

syntevo

Categories

Categories

Integrations

Bitbucket
Git
GitHub
GitLab

Integrations

Bitbucket
Git
GitHub
GitLab
Claim DiffMerge and update features and information
Claim DiffMerge and update features and information
Claim Glint and update features and information
Claim Glint and update features and information