So for some reason I'm getting a lot of conflicts with a new merged hotfix. The file that was actually [manually] changed has no conflict. All the conflicts are in files that were untouched during ...

This line of code: system("/Applications/Xcode.app/Contents/Developer/usr/bin/opendiff /Users/LukeSkywalker/Documents/doc1.rtf /Users/LukeSkywalker/Documents/doc2.rtf"); gives me this warning: ...

Hi I am trying to use opendiff as the git mergetool, but when I run mergetool I get this error message: The merge tool opendiff is not available as 'opendiff' What am I doing wrong? It was wor...

Can I configure this tool to default the choice for each differing block to the left side rather than the right side? Right now the workaround is to swap the sides, but this is slightly confusing...

I want to use opendiff as default diff-tool for git diff. This used to work but for some reason stopped working. I'm using a script: echo opendiff $2 $5 > opendiff-git.sh which is set in .git...

Today I tried to use opendiff on my MacBook Pro and I got this error. xcode-select: Error: No Xcode folder is set. Run xcode-select -switch <xcode_folder_path> to set the path to the Xcode f...

I have git configured to use ~/bin/opendiff-git.sh as my external diff tool. That script looks like this: opendiff $2 $5 When I try and do a git diff from the command line, I get this message: ...