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

One-click commit, push and pull. Unique search in history and undo for Git commands. Powerful commands like rebase, branch reset and cherry picking. And now it works with submodules. Gitbox integrates with popular diff tools such as Xcode FileMerge, Kaleidoscope, Changes, DiffMerge. Use keyboard for ultimate efficiency. Use arrow keys to jump between all the panes and lists. To stage all files, hit Cmd+Shift+Return. To stage/unstage selected files, use "S" shortcut. To pull and push, use "U" and "P" shortcuts. Press Option key to perform fetch. Press Cmd+Shift to force push or rebase. Right click menus contain all the advanced features you might need. For instance, to reset a branch, cherry pick a commit or revert a file. To amend a commit, simply undo it (cmd+Z). You can also undo merge, pull and even push. To find a bug, use color labels. Check out a commit, test it and mark if it works or not. This is a much better and visual approach than git-bisect.

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 wanting to optimize their version controloperations through a Git platform

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

$14.99 one-time payment
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

Gitbox
France
www.gitboxapp.com

Alternatives

NextDiff

NextDiff

TkoSoft

Alternatives

Gitfox

Gitfox

bytieful e.U.
TortoiseMerge

TortoiseMerge

TortoiseSVN
Compare It!

Compare It!

Grig Software
Reviu

Reviu

Joris Gallot

Categories

Categories

Integrations

Git
Kaleidoscope IoT
Xcode

Integrations

Git
Kaleidoscope IoT
Xcode
Claim DiffMerge and update features and information
Claim DiffMerge and update features and information
Claim Gitbox and update features and information
Claim Gitbox and update features and information