For some time now, I can't change FileMerge's font. Then it suddenly started using a Helvetica-like font (sans serif, variable width) for files it doesn't recognize (like typescript source files). ...

I'm new to git on OS X, and I'm using it via the command line. I come from the world of Tortoise SVN and Beyond Compare on Windows. I want to be able to send diffs to FileMerge. I was able to do ...

I regularly use Atlassian SourceTree (on Mac OS X) to launch FileMerge to resolve git merge conflicts. Out of the blue it has stopped working: when I right click and select Resolve Conflicts > L...

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 c...

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?

I see FileMerge in the Xcode app bundle: /Applications/Xcode.app/Contents/Applications/FileMerge.app I know I can open it on the command line using: open /Applications/Xcode.app/Contents/Applic...

When I attempt to run FileMerge as a GUI for Opendiff, I receive an error: $ git mergetool -t opendiff Merging: Gemfile Gemfile.lock ... Normal merge conflict for 'Gemfile': {local}: modified fi...

I use FileMerge as the difftool tool for Git. Recently, I started receiving a weird error message: Unable to load platform at path /Applications/Xcode.app/Contents/ Developer/Platforms/iPhoneOS.p...

I know you can assign shortcuts by editing the nib file that FileMerge uses, but I have no idea how to do it. I want to replace the "choose left" and "choose right" actions with specific keys on m...

I am trying to merge two .nib files. FileMerge has no problem showing the comparison of the two files. I am trying to keep all the settings in one file (i.e. right side) except for two settings tha...

When using filemerge to solve HG conflict, I got the following error FileMerge[18002:707] Unable to load platform at path /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platf...

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 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 r...

The documentation is here: http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html A handy guide is here: http://ryanflorence.com/git-for-beginners/ However, neither of them explain how...

How do I configure Apple's FileMerge program to function as Mercurial's merge tool? I have my .hgrc file setup in my home directory and I simply want to configure FileMerge as the merge program.

I had a small conflict in a .h header file in a project I'm working on. This project is tracked in Git. Fortunately, the conflict was very simple to solve. I used git mergetool And chose the def...

I have front-end JS files: -js   -a.js   -b.js   -c.js and I request http://example.com/js/all.js, I will get a file with all contents of a.js, b.js and c.js. Is there any libr...

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: ...

I have to process some data by combining two different files. Both of them have two columns that would form a primary key that I can use to match them side-by-side. The files in questions are huge ...

Accepting the possibility of extreme ridicule, I must admit that I really miss sun Teamware's filemerge tool. I have switched from solaris to red hat linux, and find myself regularly missing fileme...