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
0
votes
1 answer

How can I successfully change my default mergetool utility to opendiff

I initially did the commands mentioned in How to resolve merge conflicts in Git I did: git config merge.tool vimdiff git config merge.conflictstyle diff3 git config mergetool.prompt false Then I did the commands mentioned How to use opendiff as…
mfaani
  • 33,269
  • 19
  • 164
  • 293
0
votes
1 answer

How do I go about creating a script to compare , update and match structure of two databases

I am comparing two databases using open diff which is similar to SQL Compare. I have two databases which should match in structure so as I compare I would like to construct a script such that if the one DB has a specific table that the other DB…
King Code
  • 61
  • 1
  • 3
0
votes
1 answer

Opendiff and online file

I'd like to make a diff between to file, one is local and the other is online using for example opendiff http://www.tex.ac.uk/ctan/web/lua2dox/Doxyfile Doxyfile But it throw the following error : 2014-02-12 15:23:43.579 opendiff[72650:1007]…
Thomas Ayoub
  • 29,063
  • 15
  • 95
  • 142
0
votes
0 answers

Git diff seems to ignore the diff.external variable

I have been using visual diff tool (opendiff) with a wrapper script and set the diff.external variable to point to it for some time now. Recently I decided to try delta walker because opendiff just wasn't feature rich enough for my workflow. I used…
tehwallz
  • 134
  • 9
0
votes
2 answers

have "git show" use opendiff on osx to show commits

I found ways to use opendiff for "git diff" but "git show" doesn't have quite the same options.
vaebnkehn
  • 113
  • 5
-1
votes
1 answer

What is a certain way to make Git diff and merge use opendiff?

I am using the github advice to make it work: https://gist.github.com/329690 and right now my global config file contains: [merge] tool = opendiff external = /Users/mike/bin/git-diff-cmd.sh [diff] tool = opendiff …
nonopolarity
  • 146,324
  • 131
  • 460
  • 740
-3
votes
3 answers

array defined in header file and unknown in c file

I writing code for microcontroller and the program look like this, this is not the real program, it is just an example of it to present the problem. I wanted to show that if I point to a place in memory and define the pointer in the header file, I…
Roy Ancri
  • 119
  • 2
  • 14
1
2