Mac OS X FileMerge

cbrandtbuffalo on 2007-05-01T17:53:57

If you have a Mac and you need to merge some files, you might want to check out this utility that comes with the free developer tools:



/Developer/Applications/Utilities/FileMerge.app



Basic merge functionality, but it's simple and gets the job done.


Command-line

Aragorn on 2007-05-02T08:11:33

With FileMerge comes a command-line utility /usr/bin/opendiff. See the manpage for details :-)

Re:Command-line

cbrandtbuffalo on 2007-05-02T12:16:06

Ah, so it does. Thanks for the tip! :)