Stack Overflow
Stack Overflow

Questions tagged [p4merge]

Perforce visual merge tool, which allows users to visualize the differences between file versions.

P4Merge is the Perforce visual merge tool.

P4Merge allows users to visualize the differences between file versions. P4Merge uses color coding to simplify the process of resolving conflicts that result from parallel or concurrent development.

  • Text files differences can be highlighted and edited
  • Includes or ignores line ending or whitespace differences
  • Supports Windows (CRLF), Mac (CR), and Unix (LF) line ending conventions
  • Accepts command-line parameters and can be used from non-Peforce applications
  • Displays line numbers when comparing and merging files

P4Merge is available on the downloads page of Perforce at Downloads > Browse by Platform > Download P4Merge.

48 questions
4
votes
1 answer

Is it possible to make p4merge quit automatically when window is exited on mac os x?

I have integrated p4merge with git on my MacBook Pro OS X Yosemite. It works great with one issue. When difftool or mergetool open p4merge and I have completed my task I tend to click on the red X to dismiss my window. However this doesn't exit…
Ronald Gouldner Jr
  • 331
  • 1
  • 14
4
votes
1 answer

Perforce external diff in Eclipse?

I am using the P4Eclipse plugin for seamless integration with Perforce. I feel comfortable doing most of the P4 things with this plugin, except file diffing. By Team - Diff File(s) against Depot in the right-click context menu, an internal "Depot…
Hailei
  • 42,163
  • 6
  • 44
  • 69
3
votes
1 answer

Specify insert order for fragments

In P4Merge, if I select multiple colored icons in the right-hand pane while holding SHIFT (the blue icon corresponds to 'theirs' file, yellow - to 'base' and green - to 'mine'), all the corresponding fragments are inserted into the result: But, the…
ivan_pozdeev
  • 33,874
  • 19
  • 107
  • 152
3
votes
1 answer

External git difftool is not working on windows

I'm struggling with git for many ours and have read almost all topics taged by "git", "diff" etc. and tried hundred of different solutions, but did not succeeded at all. I'm trying to set sum external difftool (Meld, p4merge) as my git tool, BUT git…
Timon Thelure
  • 51
  • 6
3
votes
2 answers

P4Merge forgets my comparison method preference. How do I set a default value?

When running P4Merge, the comparison method is always initially set to 'Recognize line ending and white space differences' (aka all changes). I want to use 'Ignore line ending and white space length differences', but I have to manually re-set this…
gws
  • 459
  • 1
  • 7
  • 16
3
votes
1 answer

How to force textual merging with p4merge?

I'm using Perforce and its default merge tool p4merge. On integration I have several conflicts in a vcproj I wish to resolve. But it seems p4merge tries to somehow interpret the file's contents and only says "Image files can not be merged" then…
Calmarius
  • 18,570
  • 18
  • 110
  • 157
2
votes
1 answer

Three-way diff from clipboard

I know Kdiff3 can do diff from clipboard but only 2-way. Is there a tool that allow me copy&paste three text and compare it? Now I have to create three files with the text I copied and compare them. After I delete them. Can't be online tool.
JrBenito
  • 973
  • 8
  • 30
2
votes
3 answers

hg merge on command line hangs after first file merge

I've configured my command line hg to use p4merge. When I merge in a branch and there is a conflict, hg opens p4merge, to which I resolve the issues, save, then close p4 merge. Meanwhile... The command line is stuck on: running merge tool…
TheJeff
  • 3,665
  • 34
  • 52
2
votes
1 answer

Why does my Git mergetool configuration not work?

I want to set trustExitCode to false and keepTemporaries to true but it does not work... I don't underestand why. Here is my ~/.gitconfig: [merge] conflictstyle = diff3 tool = p4merge [mergetool] keepTemporaries = true …
janou195
  • 1,175
  • 2
  • 10
  • 25
1
vote
0 answers

p4merge not working on git version 2.31.1

My environment is: Centos Stream 9 I'm trying to use p4merge as diff tool but when I use: git difftool --tool-help I get: 'git difftool --tool=' may be set to one of the following: vimdiff vimdiff1 …
Dospi
  • 11
  • 2
1
vote
0 answers

Error when trying to invoke mergetool from git

Trying to invoke mergetool. Had previously set up both mergetool and difftool. Followed same process for both. Difftool works, but mergetool does not. When I try to invoke mergetool, I get: SAR@DESKTOP-7MC10MV MINGW64 ~/projects/starter-web…
Marie Resnik
  • 11
  • 1
1
vote
0 answers

How can you get the font size to persist in P4Merge on Windows?

Longtime user of P4Merge on Mac. Love it. Now I have to do some Windows work so I grabbed it for that platform. Problem is no matter what I do, I can't get my chosen font size to stick. It keeps resetting every time I reopen it. I've…
Mark A. Donohoe
  • 28,442
  • 25
  • 137
  • 286
1
vote
1 answer

Using the Built in Visual Studio Diff Tool to View P4VS's Diffs

Visual Studio has a fantastic internal diff tool: https://www.visualstudio.com/en-us/docs/tfvc/compare-files I'm using Perforce in Visual Studio via the P4VS plugin. The plugin adds the "Diff" sub-menu when you right-click on a file's tab. But by…
Jonathan Mee
  • 37,899
  • 23
  • 129
  • 288
1
vote
1 answer

How to use P4Merge tool with SVN 1.8 merge files?

I did an svn merge and I get 3 files, namely, somefile.xml.working somefile.xml.left.12345 somefile.xml.right.12350 When I launch the P4Merge tool, i have 3 text fields, named, Base, 1st file, and 2nd file. Which file goes to which box? Thanks!
Chris F
  • 14,337
  • 30
  • 94
  • 192
1
vote
1 answer

Configuring text merges with SemanticMerge to use P4Merge in Mercurial

I have followed the instructions at http://www.semanticmerge.com/sm-guides/main.shtml#HowtoconfigurewithMercurial but they are configured for kdiff3 and I would like to use p4merge to do my textual merging. My current mercurial.ini looks like…
jpmcclung
  • 109
  • 2
  • 9
1
2
3 4