is a graphical
File Comparison application included with the
Mac OS X Developer Tools . It is used to compare and merge different versions of a file. This program offers automatic file merging, but is most useful as a simple but powerful manual merge tool for text based files. FileMerge expects Unix style
Newline s and the
Mac OS Roman text encoding.
FileMerge can be found in the
/Developer/Applications/Utilities directory when the Developer Tools have been installed from the Mac OS X Tiger installation discs, or from the
Apple Developer Connection website.