Stack Overflow
Stack Overflow

Questions tagged [opendiff]

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

opendiff is a command line utility of . It provides a convenient way to launch the FileMerge application.

Syntax:

opendiff file1 file2 [-ancestor ancestorFile] [-merge mergeFile]
opendiff dir1 dir2 [-ancestor ancestorDirectory] [-merge mergeDirectory]

Resources:

22 questions
36
votes
3 answers

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 [manually] changed has no conflict. All the conflicts are in files that were untouched during the fix and apparently its an issue with…
leonsas
  • 4,718
  • 6
  • 43
  • 70
23
votes
3 answers

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 message: The merge tool opendiff is not available as 'opendiff' What am I doing wrong? It was working fine before, but since I installed a new harddrive…
CorpusCallosum
  • 233
  • 1
  • 2
  • 5
13
votes
3 answers

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 When I try and do a git diff from the command line, I get this message: 2011-02-18 13:58:55.532 opendiff[27959:60f] exception…
Nick Forge
  • 21,344
  • 7
  • 55
  • 78
11
votes
2 answers

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/Documents/doc2.rtf"); gives me this warning: 'system' is deprecated: first deprecated in iOS 8.0 -…
AaronG
  • 532
  • 1
  • 7
  • 18
7
votes
3 answers

I can't make git diff use opendiff

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 .gitconfig: [diff] external = ~/opendiff-git.sh This stopped…
Ida
  • 173
  • 9
5
votes
3 answers

Opendiff does not start anymore

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 to set the path to the Xcode folder. Error: /usr/bin/xcode-select returned unexpected…
Chris Cinelli
  • 4,679
  • 4
  • 28
  • 40
5
votes
1 answer

opendiff (FileMerge) on OS X: choose left by default

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.
Steven Lu
  • 41,389
  • 58
  • 210
  • 364
4
votes
2 answers

opendiff or other merge tool talking with remote machine's Git over ssh

How can I use opendiff or other visual merge tools to connect to a remote Linux server over ssh and handle Git merge conflicts with a local visual merge tool? Can I configure git locally to proxy for the remote server?
Christos Hayward
  • 5,777
  • 17
  • 58
  • 113
3
votes
1 answer

Using git difftool to view differences in entire directory

I'm having trouble trying to use git difftool (in this case, opendiff for mac) to visualise the differences made in the latest git commit. I don't want to launch opendiff for each pair of files that has changed, I just want to launch one instance of…
Eddy
  • 6,661
  • 21
  • 58
  • 71
2
votes
2 answers

How to use opendiff and git diff and not needing to install the whole Xcode app?

After upgrading to MacOS Mojave, my git and opendiff stopped working (my opendiff is usually invoked by git diff). I was able to get git working, by using the following two lines: xcode-select --install sudo xcode-select -switch…
nonopolarity
  • 146,324
  • 131
  • 460
  • 740
2
votes
1 answer

Error on using git mergetool with opendiff after Mavericks and Xcode 5.0.1

I just install OS X Maverics and Xcode 5.0.1 but now when I'm trying to use git mergetool with opendiff I'm getting this error: Normal merge conflict for 'Assets/Scripts/Characters/MobAI.cs': {local}: modified file {remote}: modified file Hit return…
djserva
  • 395
  • 1
  • 11
1
vote
1 answer

Why is git using different diff tools in different repositories?

I am trying to set up opendiff as my graphical git difftool. In other words, I want opendiff to open a graphical window and show my file changes when I type git difftool on the command line. I've added the following configuration to my…
John L
  • 397
  • 3
  • 12
1
vote
1 answer

git diff does not open opendiff on Mac

I'm using git to work on a text document concurrently, and I'm trying to find a nice visual way to see the changes that were done by others. I can do this by typing git diff but the result is on the Terminal. I was reading this post where it seems…
aaragon
  • 2,314
  • 4
  • 26
  • 60
1
vote
1 answer

Using OS X FileMerge/opendiff to view git differences, loading all files at once in the directory view

We are version controlling our project using git. Developing under OS X, we'd like to use the FileMerge application distributed with the development tools to display git generated differences: If we understood correctly, it is possible to configure…
Ad N
  • 7,930
  • 6
  • 36
  • 80
0
votes
2 answers

trying to setup svn external diff program on mac

I'm having problems trying to setup an external diff program for svn on Mac OSX Lion. I have both xxdiff and opendiff installed. I add these lines to ~/.subversion/config: diff-cmd = opendiff diff3-cmd = opendiff or diff-cmd =…
Eddy
  • 6,661
  • 21
  • 58
  • 71
1
2