p4merge error [GIT]

git, git-p4, p4merge, perforce

Solution

This worked for me using msysGit on windows 7:

git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd 'p4merge $BASE $LOCAL $REMOTE $MERGED'

Not sure why but the quoting screwed things up for me.

Problem

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. Additional note: it happens with any file! Any clue about what this is and how to fix it?

Original source

Related problems