DiffMerge

DiffMerge

Sourcegear
+
+

Related Products

  • PDFCreator
    557 Ratings
    Visit Website
  • Label LIVE
    180 Ratings
    Visit Website
  • Files.com
    332 Ratings
    Visit Website
  • CirrusPrint
    2 Ratings
    Visit Website
  • pCloud Business
    188 Ratings
    Visit Website
  • MobiPDF (formerly PDF Extra)
    7,001 Ratings
    Visit Website
  • Globalscape Enhanced File Transfer (EFT)
    109 Ratings
    Visit Website
  • Filerev
    3 Ratings
    Visit Website
  • Thinfinity Workspace
    14 Ratings
    Visit Website
  • Airlock Digital
    35 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

Fork is getting better and better day after day and we are happy to share our results with you. Fork gently informs you about GitHub notifications without being annoying. Resolve your merge-conflicts easily using the merge-conflict helper and built-in merge-conflict resolver. Edit, reorder and squash your commits using visual interactive rebase. Fork allows you to see diffs for the common image formats. Fork's Diff Viewer provides a clear view to spot the changes in your source code quickly. With history view you can find all commits where a particular file or directory was changed. With blame view you can find the last commit which changed a particular file line.

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 interested in a better Git client

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

$49.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 4.0 / 5
ease 4.0 / 5
features 5.0 / 5
design 3.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

Fork
git-fork.com

Alternatives

NextDiff

NextDiff

TkoSoft

Alternatives

TortoiseMerge

TortoiseMerge

TortoiseSVN
Gitfox

Gitfox

bytieful e.U.
Compare It!

Compare It!

Grig Software
Glint

Glint

Logic Over Snacks Ltd.

Categories

Categories

Integrations

Git
GitHub
Loopon

Integrations

Git
GitHub
Loopon
Claim DiffMerge and update features and information
Claim DiffMerge and update features and information
Claim Fork and update features and information
Claim Fork and update features and information