Average Ratings 0 Ratings

Total
ease
features
design
support

No User Reviews. Be the first to provide a review:

Write a Review

Average Ratings 0 Ratings

Total
ease
features
design
support

No User Reviews. Be the first to provide a review:

Write a Review

Description

DiffMerge is a software tool designed for visually comparing and merging files across Windows, OS X, and Linux platforms. It provides a graphical display of the modifications made between two files, featuring intra-line highlighting and comprehensive editing capabilities. Additionally, it can graphically illustrate the differences among three files simultaneously. The application supports automatic merging when deemed safe and grants users full control over the editing process for the resultant file. It also enables a side-by-side comparison of two folders, highlighting files unique to each folder and indicating which file pairs are identical or differ. Users can quickly initiate a comparison by right-clicking on any two files in Windows Explorer. With customizable rulesets and options, users can tailor the appearance and functionality to meet their specific needs. The application maintains a consistent feature set across all operating systems, ensuring that users have the same experience regardless of their platform. Furthermore, DiffMerge is built on UNICODE, allowing it to import files with various character encodings, making it versatile for different text types. This flexibility makes it a preferred choice for developers and anyone needing detailed file comparison.

Description

Experience seamless Git operations with one-click commit, push, and pull functionalities, alongside a unique search feature for history and an undo option for Git commands. Among the powerful capabilities offered are rebase, branch reset, and cherry-picking, with added support for submodules. Gitbox also provides integration with widely-used diff tools such as Xcode FileMerge, Kaleidoscope, Changes, and DiffMerge to enhance your workflow. Maximize your efficiency by utilizing keyboard shortcuts, allowing quick navigation through panes and lists with arrow keys. To stage all files at once, simply press Cmd+Shift+Return, and for staging or unstaging selected files, hit the "S" key. Pulling and pushing are made easy with the "U" and "P" shortcuts, while fetching is as simple as pressing the Option key. Additionally, using Cmd+Shift enables force push or rebase functionalities. Right-click menus are equipped with an array of advanced features, including the ability to reset branches, cherry-pick commits, or revert files. For amending a commit, just undo it with cmd+Z, and you can also reverse merges, pulls, and pushes as needed. To assist in debugging, utilize color labels to check out commits, test their functionality, and indicate whether they work as intended, presenting a visually intuitive alternative to the git-bisect method. This streamlined approach not only enhances productivity but also simplifies complex version control tasks significantly.

API Access

Has API No 

API Access

Has API No 

Screenshots View All

Screenshots View All

Integrations

Git No 
Kaleidoscope IoT No 
Xcode No 

Integrations

Git Yes 
Kaleidoscope IoT Yes 
Xcode Yes 

Pricing Details

No price information available.
Free Trial No 
Free Version Yes 

Pricing Details

$14.99 one-time payment
Free Trial No 
Free Version No 

Deployment

Web-Based No 
On-Premises No 
iPhone App No 
iPad App No 
Android App No 
Windows Yes 
Mac Yes 
Linux Yes 
Chromebook No 

Deployment

Web-Based No 
On-Premises No 
iPhone App No 
iPad App No 
Android App No 
Windows No 
Mac Yes 
Linux No 
Chromebook No 

Customer Support

Business Hours Yes 
Live Rep (24/7) No 
Online Support Yes 

Customer Support

Business Hours No 
Live Rep (24/7) No 
Online Support Yes 

Types of Training

Training Docs Yes 
Webinars No 
Live Training (Online) No 
In Person Yes 

Types of Training

Training Docs Yes 
Webinars No 
Live Training (Online) No 
In Person No 

Vendor Details

Company Name

Sourcegear

Country

United States

Website

sourcegear.com/diffmerge/index.html

Vendor Details

Company Name

Gitbox

Country

France

Website

www.gitboxapp.com

Product Features

File and Document Comparison

Audio Comparison No 
Barcode Comparison No 
Braille Comparison No 
Code Comparison No 
Document Comparison No 
File Comparison No 
Image Comparison No 
PDF Comparison No 
Video Comparison No 

Product Features

Alternatives

TortoiseMerge Reviews

TortoiseMerge

TortoiseSVN

Alternatives

NextDiff Reviews

NextDiff

TkoSoft
Gitfox Reviews

Gitfox

bytieful e.U.
Reviu Reviews

Reviu

Joris Gallot
Compare It! Reviews

Compare It!

Grig Software