p4merge
Fewer than 5 people recommend it so far, so there's no written verdict. Here is what commenters said.
3recommend
0warn against
Mar 22, 2026first mention
Oct 13, 2026latest mention
Why people recommend it
“the p4merge tool was GOAT”
Caveats and dissent
No one in these comments warned against it.
Often compared with
Threads where it came up
Data: p4merge.json. Quotes are verbatim; the verdict and theme labels are written by a model from these comments, and every clause links to its sources.
All comments 4
https://git-scm.com/docs/git-p4
“the p4merge tool was GOAT”
Even if you don’t use p4merge, you can set Git’s merge.conflictStyle config to "diff3" or "zdiff3" (https://git-scm.com/docs/git-config#Documentation/git-config.txt-mergeconflictStyle). If you do that, Git’s conflict markers show the base version as well: <<<<<<< left ||||||| base def calculate(x): a = x * 2 b = a + 1 return b ======= def calculate(x): a = x * 2 logger.debug(f"a={a}") b = a + 1 return b >>>>>>> right
“I used p4merge as my merge tool for a long time”