windows - Git mergetool with Perforce -
I'm using Perforce to solve file conflict in Git, to set it, I
git config --global mergetool.p4merge.cmd 'p4merge.exe \ "$ base \" \ "$ LOCAL \" \ "$ REMOTE \" \
has been generated after the conflict,git mergetool
p4merge
issues the following error message:Errors: " ./myfile.BASE.7132.example "is an invalid file." /myfile.LOCAL.7132.example "is an invalid file" ./myfile.REMOTE.7132.example "is an invalid file" myfile.example is an invalid The file is
it
not c: \ users \ abc \ project \ path \ myfile.example
, but it appears that they are inside the root directory.I am working on Windows.
How can I force the files to take the right path?
Comments
Post a Comment