FileMerge diff wrapper
Shell
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Failed to load latest commit information.
Makefile
README.md
fmdiff
fmdiff3
fmmerge
fmresolve

README.md

Using FileMerge as a Diff Command (Lion)

Bash scripts for wrapping the XCode utility FileMerge so it can be used a diff command for Subversion and Mercurial.

Original

These scripts are just small changes to the original created by Bruno De Fraine. With XCode 4.3 under Lion, the location of the FileMerge utility is now hidden inside the XCode bundle, so the paths have been updated in these versions. The originals for XCode 4.2 and below can be found at De Fraine's site.

Basic Usage

Download and install using the makefile:

make
sudo make install

Quirks

The FileMerge app has to be Quit out of for each merge operation. Using the Cmd+W shortcut to close the window will not work.