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? ...
p4merge
p4merge error
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 wanna start the mergetool configured (p4merge) and then I get the error above. Addition...
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 first conflict. this conflict maynot be related to that developers, so am searching for a ...
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 left and right panels are the names of the temporary files SVN has created to feed to p...