I am trying to use command git difftool -d
for a folder diff.
The command get diff list successfully (show in FileMerge.app). But when I try to open each diff file. I get file does not exist
error.
Output log:
$ git difftool -d
merge tool candidates: opendiff kdiff3 tkdiff xxdiff meld kompare gvimdiff diffuse ecmerge p4merge araxis bc3 codecompare emerge vimdiff
Image:
I am using git version 1.8.1.1 on mac OS X 10.9. Thanks.
The problem is the opendiff command returns which causes difftool to delete the temp directory and all the files you are comparing. After a ton of searching I found this, basically you have to keep that opendiff running until FileMerge exits. change your git config to:
found the answer here: https://gist.github.com/bkeating/329690