Here’s the Deal

P4Merge vs Sublimerge

271 48

110 8

When comparing P4Merge vs Sublimerge, the Slant community recommends P4Merge for most people. In the question“What are the best diff tools for Git?” P4Merge is ranked 2nd while Sublimerge is ranked 15th. The most important reason people chose P4Merge is:

P4Merge is free of charge.

Specs

LicenseFree

PlatformsWindows; Mac; Linux

No specs yet!

Ranked in these QuestionsQuestion Ranking

Common Questions

What are the best diff tools for Git?

What are the best Linux diff tools?

What are the best merge applications for Git?

What are the best free 3-way merge tools for Windows?

Pros

Pro
Free

P4Merge is free of charge.

Pro
3 way merge support

P4Merge presents merge information in 4 panes - BASE, LOCAL, REMOTE and MERGE_RESULT.

Pro
Detects minimal changes without having a common ancestor

After a merge sometimes you have conflicts. You can resolve them by using a merge tool. You can run git mergetool --tool-help to get more details about what tools are supported.

You will get an output like the following
git mergetool --tool=<tool> may be set to one of the following:

      p4merge
        tortoisemerge
        vimdiff
        vimdiff2
        vimdiff3

The following tools are valid, but not currently available:

        araxis
        bc
        bc3
        codecompare
        deltawalker
        diffmerge
        diffuse
        ecmerge
        emerge
        gvimdiff
        gvimdiff2
        gvimdiff3
        kdiff3
        meld
        opendiff
        tkdiff
        winmerge
        xxdiff

Some of the tools listed above only work in a windowed environment. If run in a terminal-only session, they will fail.

Pro
Also has image diffing

For those who are working in both text based source code or files, as well as images, its nice to have the diff functionality of both present in the same product.

Pro
Cross-platform with a good Mac port

P4Merge works on Windows, Linux and OS X.

Pro
Three-way diff allows easy merging of files

Pro
sublimerge

i recommend Sublimerge

Pro
Highlights intraline changes

Pro
Built-in support for Git, Subversion and Mercurial commands

Sublimerge automatically integrates with your version control history, and lets you compare between revisions, branches, remotes, and the staging area.

Pro
Can compare to clipboard contents

Ad
Cons

Con
Directory comparison is not supported

With P4Merge it's impossible to compare two different directories to find differences.

Con
Bad tech support

Con
It's NOT Open Source

You can't fix or, implement nothing. And when the developer abandons the project you will be left in the lurch.

Con
It's not free

Nither as free price nor as free in freedom.

Con
Cannot compare text within the same file

Sublimerge can only compare entire file diffs, but not two selections within a file. Comparing within files can be useful for example, by refactoring two similar functions to use a shared function. With Sublimerge, you need to copy the sections into two new temporary tabs and compare between the two. This can be cumbersome, as if you have another untitled file, you won't be able to know which one is which.