Average Ratings 0 Ratings
Average Ratings 0 Ratings
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
It's easier and more visually easy to manage your Git repositories.
Features:
- A graph that shows branches, commits and where merges occurred in an easy-to-read visual format
- Use a 4-way diff editor to perform merges and resolve conflicts
- Multiple merges can be managed simultaneously without affecting files on disk or requiring you to switch branches.
- Search your repository history for commits and files
- Integrate Bitbucket, GitLab and GitHub to create or clone repositories easily
- Squash commits together
- Insert new commits in middle
- You can move individual changes from one commit into another
- Edit commit messages
- Undo/redo
API Access
Has API
API Access
Has API
Integrations
Bitbucket
Git
GitHub
GitLab
Pricing Details
No price information available.
Free Trial
Free Version
Pricing Details
$0
Free Trial
Free Version
Deployment
Web-Based
On-Premises
iPhone App
iPad App
Android App
Windows
Mac
Linux
Chromebook
Deployment
Web-Based
On-Premises
iPhone App
iPad App
Android App
Windows
Mac
Linux
Chromebook
Customer Support
Business Hours
Live Rep (24/7)
Online Support
Customer Support
Business Hours
Live Rep (24/7)
Online Support
Types of Training
Training Docs
Webinars
Live Training (Online)
In Person
Types of Training
Training Docs
Webinars
Live Training (Online)
In Person
Vendor Details
Company Name
Sourcegear
Country
United States
Website
sourcegear.com/diffmerge/index.html
Vendor Details
Company Name
Logic Over Snacks Ltd.
Country
United Kingdom
Website
glint.info
Product Features
File and Document Comparison
Audio Comparison
Barcode Comparison
Braille Comparison
Code Comparison
Document Comparison
File Comparison
Image Comparison
PDF Comparison
Video Comparison