DiffMerge

DiffMerge

Sourcegear
+
+

Related Products

  • PDF Guru
    101,414 Ratings
    Visit Website
  • Label LIVE
    184 Ratings
    Visit Website
  • Files.com
    338 Ratings
    Visit Website
  • CirrusPrint
    2 Ratings
    Visit Website
  • pCloud Business
    189 Ratings
    Visit Website
  • MobiPDF
    8,085 Ratings
    Visit Website
  • Globalscape Enhanced File Transfer (EFT)
    109 Ratings
    Visit Website
  • Filerev
    3 Ratings
    Visit Website
  • Thinfinity Workspace
    16 Ratings
    Visit Website
  • ManageEngine Endpoint Central
    3,347 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 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 Not 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 interested in a better Git client

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

$49.99
Free Version Not 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 4.0 / 5
ease 4.0 / 5
features 5.0 / 5
design 3.0 / 5
support 5.0 / 5

Pros & Cons from Real Users

Pros

  • Fork is a very solid Git tool with some very nice features. The blame tool in particular is very helpful when trying to debug errors or crashes in software development. That said many of these benefits will not be applicable to all developers or development styles. The performance of the application is solid and the UI is of a decent quality.

Cons

  • High entry price and no free versions are my main complaints, this tool is not well suited for smaller non-profit, volunteer or freeware groups with its upfront costs when compared to alternatives I have reviewed. Additionally, it is a more technical Git tool, it is not well suited for developers who are adept at more technical code tasks and setups as compared to competitors. Similarly, the UI is not designed as well as those in other Git tools such as GitHub or GitLab.

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

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

Git GUI Clients Supported

Integrations

Git Not Supported
GitHub Not Supported
Loopon Not Supported

Integrations

Git Supported
GitHub Supported
Loopon Supported
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