Top "Filemerge" questions

How to use git mergetool's filemerge

The documentation is here: http://www.kernel.org/pub/software/scm/git/docs/git-mergetool.html A handy guide is here: …

macos git mergetool filemerge

How do I pipe in FileMerge as a diff tool with git on OS X?

I'm new to git on OS X, and I'm using it via the command line. I come from the world …

git macos command-line filemerge

How do I open FileMerge.app on Mac OS 10.13+ and Xcode 9+?

I see FileMerge in the Xcode app bundle: /Applications/Xcode.app/Contents/Applications/FileMerge.app I know I can open …

xcode macos filemerge

Cannot find FileMerge (opendiff tool) but I have xcode 4.6 installed

When I attempt to run FileMerge as a GUI for Opendiff, I receive an error: $ git mergetool -t opendiff Merging: …

xcode macos git filemerge

Cleaning up after a conflicted git merge?

I had a small conflict in a .h header file in a project I'm working on. This project is tracked …

git version-control merge merge-conflict-resolution filemerge

Configuring Mercurial - FileMerge for Apple Mac OS X

How do I configure Apple's FileMerge program to function as Mercurial's merge tool? I have my .hgrc file setup in …

configuration mercurial macos filemerge

FileMerge quits immediately after launching from SourceTree

I regularly use Atlassian SourceTree (on Mac OS X) to launch FileMerge to resolve git merge conflicts. Out of the …

xcode atlassian-sourcetree filemerge

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 …

xcode git filemerge opendiff

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 …

macos filemerge