Stack Overflow
Stack Overflow

Questions tagged [filemerge]

This tag is used to indicate the process uses the merging of two or more files.

63 questions
6
votes
2 answers

SourceTree filemerge quits immediately and creates 4 files. How to fix it?

yesterday I could merge files in sourcetree with the external tool filemerge. Today, sourcetree wanted me to register me, and after my successful registration, I couldnt start filemerge. When I choose "Launch external diff tool" from the…
fvosberg
  • 627
  • 9
  • 25
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,103
  • 3
  • 25
  • 38
5
votes
4 answers

How do you do a 3-way merge in FileMerge?

I see the option for specifying three files (left, right, and ancestor), but it doesn't seem to be possible to actually display the ancestor. The bottom pane shows the result of the merge. I'd rather see what the original content was, so I could…
Mark E. Haase
  • 23,180
  • 7
  • 58
  • 69
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
  • 36,733
  • 50
  • 179
  • 328
5
votes
4 answers

Linking Gitbox diff tool to FileMerge after upgrading to Xcode 5

I just upgraded to Xcode 5 and now Gitbox doesn't seem to be able to find FileMerge as the diff tool, and has no options for setting a path manually. Anyone know a way to link it up again?
Tony Beninate
  • 1,735
  • 1
  • 22
  • 38
3
votes
0 answers

Git difftool -- how to ignore images?

i'm a git / osx / unix newbie but in my current job, i'm using them all. i run "git difftool" a lot to compare changes in a commit, but any time it runs into an image, i get an error from FileMerge and i have to make a few unnecessary clicks to…
Doug Varn
  • 31
  • 2
3
votes
2 answers

`git difftool -d` get 'file does not exist' error on mac

I am trying to use command git difftool -d for a folder diff. The command get diff list successfully (show in FileMerge.app). But when I try to open each diff file. I get file does not exist error. Output log: $ git difftool -d merge tool…
jeecd
  • 61
  • 3
3
votes
4 answers

How do I open a .diff file on a mac?

I have a .diff file but I don't know how to open it. I trie using FileMerge but that doesn't give me an option to open a .diff file. Any ideas? Thanks.
lostInTransit
  • 68,087
  • 58
  • 193
  • 270
3
votes
1 answer

Using Filemerge how to you get to see the lower pane. The one with the results in?

You know, you do a clean install and the pane at the bottom has disappeared. I loved that pane.
Will Johnston
  • 844
  • 4
  • 18
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
  • 130,775
  • 117
  • 415
  • 675
2
votes
1 answer

xCode FileMerge - "Line ending differ"

When I open the 2 files as left & right in FileMerge, I can see the things like the following screenshot. As you can see, it doesn't show contents of the right file. Before I saw this error, I did these things : Picked some difference things and…
Stan Pak
  • 21
  • 1
  • 2
2
votes
1 answer

How do I tell FileMerge to remember my settings about the bottom pane?

A few years ago, someone asked how they could get the bottom pane in FileMerge back. The answer was that FileMerge remembered your settings, and if you'd accidentally resized the bottom pane to take up no space at all, it would faithfully be…
Sam Kington
  • 1,192
  • 10
  • 14
2
votes
0 answers

FileMerge: This file type cannot be merged

FileMerge.app fails with an odd message: This file type cannot be merged. when I try to save successfully merged text files, which definitely can be merged. (I invoke FileMerge from git using opendiff tool on OS X 10.6.3, but problem happens even…
Kornel
  • 91,239
  • 30
  • 200
  • 278
2
votes
1 answer

Issue when merging 2 files into one file in batch

I have an issue when merging 2 files into one file. The first file contains the lines 1 2 3 4 and the second contains the lines 5 6 7. When I do this: copy test1.txt+test2.txt result.txt I get the below lines. Please see that 4 is near…
cip
  • 33
  • 5
2
votes
4 answers

iPhone version control tools (subversion)

I've used iPhone SDK and tools for several months. Xcode seems pretty nice, but there is one tool which I don't get: FileMerge. How can anyone use it for comparing files or doing merge? Seriously now, what do you really use? My use case is…
JOM
  • 7,969
  • 6
  • 76
  • 110
1
2
3 4 5