Top "Opendiff" questions

For issues relating to the opendiff command line utility of Xcode.

How to resolve ALL conflicts using HEAD, with any mergetool

So for some reason I'm getting a lot of conflicts with a new merged hotfix. The file that was actually […

Read More
git git-merge opendiff
How to use opendiff as default mergetool

Hi I am trying to use opendiff as the git mergetool, but when I run mergetool I get this error …

Read More
git mergetool opendiff
How do you use posix_spawn to replace the deprecated 'system' to launch opendiff in Objective-C?

This line of code: system("/Applications/Xcode.app/Contents/Developer/usr/bin/opendiff /Users/LukeSkywalker/Documents/doc1.rtf /Users/LukeSkywalker/…

Read More
objective-c ios8 xcode6 posix opendiff
git diff with opendiff gives "Couldn't launch FileMerge" error

I have git configured to use ~/bin/opendiff-git.sh as my external diff tool. That script looks like this: opendiff $2 $5 …

Read More
xcode git filemerge opendiff