P4Merge Review

271 48

Review of P4Merge powered by the Slant community.

SpecsUpdate

PlatformsWindows; Mac; Linux

LicenseFree

Ranked in these QuestionsQuestion Ranking

What are the best diff tools for Git?

What are the best visual merge tools for Git?

What is the best tool for resolving conflicts when merging file changes?

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

What are the best folder/file compare/diff tools for either OSX, Linux or Windows?

What are the best merge applications for Git?

What are the best Linux diff tools?

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.