Although it’s not exactly the same as piping stdin into a script, you can do this: git difftool -t opendiff -y That will launch FileMerge once for each file. Doing the whole project tree at once takes a little scripting. See also this question.
I have the same FileMerge warning in Git. When I look inside Xcode’s preferences, I can see that neither the iPhoneSimulator nor the iPhoneOS platforms are installed but the directories do exist when I look into “/Applications/Xcode.app/Contents/Developer/Platforms”. I don’t develop for iOS, so I deleted both iPhoneOS.platform and iPhoneSimulator.platform and the warning went away. If … Read more
I haven’t found any official documentation for it, but here’s the understanding I got from trial and error: There’s a split view with your two options on the left and right. You can’t edit either of those. There’s also a bottom view which you can edit. You might need to pull up on the little … Read more
To diagnose the problem, I ran opendiff from the Terminal. I received the following error: xcode-select: error: tool ‘opendiff’ requires Xcode, but active developer directory ‘/Library/Developer/CommandLineTools’ is a command line tools instance To solve: Open Xcode > Preferences > Locations Click on the drop-down box beside Command Line Tools and select your current Xcode version. … Read more