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
37
votes
6 answers

How to use p4merge as the merge/diff tool for Mercurial?

Does anyone know how to setup Mercurial to use p4merge as the merge/diff tool on OS X 10.5?
Jay Stramel
  • 3,241
  • 4
  • 28
  • 25
28
votes
2 answers

p4merge error [GIT]

I am trying to use p4merge with git but I am getting: Error starting p4merge: "path/myFile" is (or points to) an invalid file (this lists the BASE, LOCAL, REMOTE, and standard version of the file). Git tells me about the conflict then it asks if I…
JohnIdol
  • 48,899
  • 61
  • 158
  • 242
18
votes
1 answer

p4merge fails when doing a directory diff?

I am trying to use p4merge as my diff/merge tool in git. But I got a serious problem. I can use p4merge as a difftool with git difftool it works well. And I can also use it as a mergetool. But when I try to let it do a directory diff…
shengy
  • 9,461
  • 4
  • 37
  • 61
15
votes
4 answers

Using p4merge as git diff tool

I use windows 7. I want to use p4merge as Git diff/merge tool. I follow this article and this one to setup and config p4merge: git config --global merge.tool p4merge git config --global mergetool.p4merge.path "C:/Program…
hasanghaforian
  • 13,858
  • 11
  • 76
  • 167
13
votes
4 answers

How to use difftool and mergetool on Windows 10 Ubuntu bash (WSL)

I use Windows 10 Ubuntu bash, provided by Windows Subsystem for Linux. I want to use a visual diff/merge tool for git. I installed p4merge on Windows (followed this artice) and configured the git .gitconfig file with the following way (I adjusted…
aszoke
  • 380
  • 3
  • 10
13
votes
2 answers

How to integrate visual conflict resolution (P4Merge) into SourceTree

For quite some time now, I have been bedeviled by SourceTree's lack of usable conflict resolution. There is supposed to be a procedure for integrating p4Merge or some other diff/merge tool into SourceTree. For the moment, p4Merge is my tool of…
Robert Harvey
  • 178,213
  • 47
  • 333
  • 501
11
votes
3 answers

Difference between 'remote', 'local', and 'base' using p4merge

I'm merging my branch on the master branch using the p4Merge tool, and I see three views: LOCAL REMOTE BASE What are the differences between these views?
slacky82
  • 342
  • 4
  • 11
11
votes
2 answers

Configure P4merge as my SVN diff tool on OSX

I want to use P4merge as my external diff tool for files in SVN when comparing local to unchanged. I just spent several hours on this when I should have been coding. What do I need to do on OSX platform?
MedicineMan
  • 15,008
  • 32
  • 101
  • 146
11
votes
10 answers

error with p4merge merging tool in git

I have setup my classpath for p4merge an set the file .gitconfig, but there i get this error when the p4merge tool suppose to opem those two files that are in conflict. anybody knows the solution? added to classpath: "C:\Program…
user1415621
  • 111
  • 1
  • 1
  • 3
10
votes
3 answers

p4merge and Git 1.8.3

How can I config git to use p4merge as my mergetool? Next is my current situation: $ git --version git version 1.8.3.msysgit.0 $ git mergetool This message is displayed because 'merge.tool' is not configured. See 'git mergetool --tool-help' or…
Mahmoud Samy
  • 2,822
  • 7
  • 34
  • 78
9
votes
1 answer

How to set file labels in p4merge

When p4merge is invoked from p4v it displays depot paths as labels on the files. I would like to use p4merge as a diff viewer for SVN, and to that end I have this batch file: @echo off pause p4merge %6 %7 This works, but the labels appearing on the…
Weeble
  • 17,058
  • 3
  • 60
  • 75
6
votes
1 answer

How to set up p4merge as diff tool for Visual Studio 2015 | git

I've managed to successfully wire up P4Merge with TortoiseGit through this tutorial. However, given I'm spending most of my time in the IDE (Visual Studio 2015), I'd like to also set this one up to use P4Merge as a diff tool. Previously (aka while…
Alexandru Marculescu
  • 5,569
  • 6
  • 34
  • 50
6
votes
1 answer

p4merge displays error 'nul is (or points to) an invalid file' when I am using git difftool --cached

I just decided and installed p4merge as my visual merge tool for git. In order to do that I've configured my git using this command git config --global merge.tool p4merge git config --global mergetool.p4merge.cmd 'p4merge $BASE $LOCAL $REMOTE…
ramaadhitia
  • 303
  • 1
  • 12
4
votes
1 answer

GIT 2 or more merge conflicts in a single file - how p4merge handles?

GIT p4merge - 2 or more conflict in same file I have integrated p4merge with GIT and i came across this situation once. I have a file with merge conflicts. The file say foo.c has merge conflicts in 3 different lines of code (the first line with…
Senthil A Kumar
  • 10,306
  • 15
  • 44
  • 55
4
votes
0 answers

Resolve selected merge conflicts using p4merge in GIT

Is there a way to resolve selected file having conflicts using p4merge in GIT? Lets say there are 25 conflicts and each conflict has to be resolved by each developer, if any developer runs 'git mergetool' the p4merge which is setup starts with the…
Senthil A Kumar
  • 10,306
  • 15
  • 44
  • 55
1
2 3 4