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 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? 回答1: This worked for me using msysGit on windows 7: git config --global merge