DiffMerge

DiffMerge

Sourcegear
+
+

Related Products

  • PDFCreator
    539 Ratings
    Visit Website
  • Label LIVE
    180 Ratings
    Visit Website
  • Files.com
    332 Ratings
    Visit Website
  • CirrusPrint
    2 Ratings
    Visit Website
  • pCloud Business
    187 Ratings
    Visit Website
  • MobiPDF (formerly PDF Extra)
    6,998 Ratings
    Visit Website
  • Globalscape Enhanced File Transfer (EFT)
    104 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

GitBunki is a native macOS Git client built in SwiftUI with a hop. It is a full Git client that gets out of the way, inspired by the late, great GitX, with a keyboard-first, three-pane layout for staging, history, branches, tags, stashes, and remotes. GitBunki wraps the git binary developers already trust, sends nothing to the cloud, and focuses on a calm native Mac experience instead of an Electron-style interface. Users can stage down to hunks, lines, or words, double-click to stage or unstage files, shift-click a range of lines, amend the last commit, and commit from the message with Cmd+Enter. The full commit log includes a lane-based visual graph, branch and tag badges, search by message, author, or SHA, Gravatar avatars with initials fallback, and right-click actions for cherry-pick, revert, reset, and interactive rebase. Diff review supports unified and side-by-side modes, while file history and blame give per-line context with author, date, SHA, and summary.

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

MacOS-first developers who need a native, keyboard-friendly Git client for staging, history review, branching, rebasing, and repository management

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

No information available.
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

GitBunki
United States
gitbunki.com

Alternatives

NextDiff

NextDiff

TkoSoft

Alternatives

No Alternatives
TortoiseMerge

TortoiseMerge

TortoiseSVN
Compare It!

Compare It!

Grig Software

Categories

Categories

Integrations

Git
SwiftUI

Integrations

Git
SwiftUI
Claim DiffMerge and update features and information
Claim DiffMerge and update features and information
Claim GitBunki and update features and information
Claim GitBunki and update features and information