DiffMerge

DiffMerge

Sourcegear
Plastic SCM

Plastic SCM

Codice Software
+
+

Related Products

  • PDFCreator
    536 Ratings
    Visit Website
  • Label LIVE
    176 Ratings
    Visit Website
  • Files.com
    309 Ratings
    Visit Website
  • CirrusPrint
    2 Ratings
    Visit Website
  • MobiPDF (formerly PDF Extra)
    6,519 Ratings
    Visit Website
  • Filerev
    3 Ratings
    Visit Website
  • Thinfinity Workspace
    14 Ratings
    Visit Website
  • Airlock Digital
    35 Ratings
    Visit Website
  • Cerberus FTP Server
    159 Ratings
    Visit Website
  • Screencapt
    122 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

Unity Plastic SCM is a version control and source code management tool built to improve team collaboration and scalability with any engine. It offers optimized workflows for artists and programmers, as well as superior speed in working with large files and binaries. Plastic SCM offers tons and tons of features that make a developer's life much easier. Good branching and merging is key for "task-driven development" , feature branches, and good release management. Using Plastic, you'll branch fast even with huge code bases. You'll be able to diff refactored code with the new built-in semantic diff plus the "analyze refactors" feature. It can find refactored code across files for C#/Vb.net, Java, and C. The built-in 3-way merge tool Xdiff/Xmerge lets you resolve even the most complex merge conflicts since it features language-agnostic refactoring support. Plastic includes our SemanticMerge product.

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

Developer teams and companies seeking a solution to build and deploy apps and systems

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

$6.95 per month
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 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

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

Codice Software
United States
www.plasticscm.com

Alternatives

TortoiseMerge

TortoiseMerge

TortoiseSVN

Alternatives

P4

P4

Perforce
Compare It!

Compare It!

Grig Software
Bitbucket

Bitbucket

Atlassian

Categories

Categories

Software Configuration Management (SCM) Features

Automated Cleanup
Branch Merging
Code Review
Concurrency Management
Defect Tracking
Flexible Branching
Rapid Hotfix
Rapid Rebuilds
Regulatory Compliance
Version Control / Management
Workflow / Process Automation

Source Code Management Features

Access Controls/Permissions
Bug Tracking
Build Automation
Change Management
Code Review
Collaboration
Continuous Integration
Repository Management
Version Control

Version Control Features

Branch Creation / Deletion
Centralized Version History
Code Review
Code Version Management
Collaboration Tools
Compare / Merge Branches
Digital Asset / Binary File Storage
Isolated Code Branches
Option to Revert to Previous
Pull Requests
Roles / Permissions

Integrations

No info available.

Integrations

No info available.
Claim DiffMerge and update features and information
Claim DiffMerge and update features and information
Claim Plastic SCM and update features and information
Claim Plastic SCM and update features and information