DiffMerge

DiffMerge

Sourcegear
Sublime Merge

Sublime Merge

Sublime HQ
+
+

Related Products

  • PDFCreator
    494 Ratings
    Visit Website
  • MobiPDF (formerly PDF Extra)
    5,226 Ratings
    Visit Website
  • Netwrix Auditor
    296 Ratings
    Visit Website
  • CirrusPrint
    2 Ratings
    Visit Website
  • Thinfinity Workspace
    14 Ratings
    Visit Website
  • SmartWindows
    5 Ratings
    Visit Website
  • Label LIVE
    165 Ratings
    Visit Website
  • Globalscape Enhanced File Transfer (EFT)
    76 Ratings
    Visit Website
  • Comet Backup
    224 Ratings
    Visit Website
  • Teleprompter.com
    3 Ratings
    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

Line-by-line Staging. Commit Editing. Unmatched Performance. With a zippy cross-platform GUI toolkit, an unmatched syntax highlighting engine, and a custom high-performance Git reading library, Sublime Merge sets the bar for performance. Commit exactly what you want with line-by-line and hunk staging. Select one or more lines to split hunks into multiple changes. With the power of Sublime Text syntax highlighting, you can understand exactly what's been changed in a commit. With over 40 supported languages out of the box, and automatic loading of installed third-party syntaxes, we've got you covered.

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 that want a better Git GUI client for Mac, Windows, 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

$99
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 5.0 / 5
ease 5.0 / 5
features 5.0 / 5
design 5.0 / 5
support 5.0 / 5

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

Sublime HQ
Founded: 2007
Australia
www.sublimemerge.com

Alternatives

Compare It!

Compare It!

Grig Software

Alternatives

Gitfox

Gitfox

bytieful e.U.
TortoiseMerge

TortoiseMerge

TortoiseSVN
SmartGit

SmartGit

syntevo

Categories

Categories

Integrations

Git
Sublime Text

Integrations

Git
Sublime Text
Claim DiffMerge and update features and information
Claim DiffMerge and update features and information
Claim Sublime Merge and update features and information
Claim Sublime Merge and update features and information