0

Phpstorm 7.1.2 as external git difftool problem

Hi
I'm using phpstorm 7.1.2 as external difftool in git. And on the latest release of phpstorm somethin went wrong.

Details.

My git config:

[difftool "phpstorm"]
    prompt = true
    cmd = cmd.exe //C "\"C:/Program Files (x86)/JetBrains/PhpStorm 7.1.1/bin/PhpStorm.bat\" diff \"$LOCAL\" \"C:/project/$REMOTE\""
    trustExitCode = true

After executing "git difftool master...branchname" git prints to open viewer for first diff:

Viewing: 'folder/class.php
Launch 'phpstorm' [Y/n]:


I'm pressing Y and phpstorm launches with error:
"Diff: Error showing diff: Can't find file nul"

But on the second promt for viewing (within one difftool session):

Viewing: 'index.php'
Launch 'phpstorm' [Y/n]:


phpstorm launches without errors in difftool mode.

What can it be?

10 comments

Please sign in to leave a comment.