System Requirements:
- Intel CPU: OS X 10.6 (Snow Leopard) or newer.
- 20 MB available hard disk space.
Packaging Choices:
On OSX DiffMerge is distributed in both DMG and PKG format packages. The PKG format will automatically handle all of the installation details whereas the DMG format will allow you to manually install the pieces as you wish.
In both packages, DiffMerge is built as a Universal binary having both Intel i386 (32-bit) and Intel x86_64 (64-bit) executables and are targeted to 10.6 and newer. OS X will automatically choose the best version for your system at runtime.
Installing from the PKG:
To install DiffMerge using the PKG version, simply click on it.
It will install the DiffMerge application bundle in /Applications.
It will also install the command line tool (in /usr/local/bin/diffmerge) and
a diffmerge(1) man-page (in /usr/share/man).
Installing from the DMG:
After downloading the most recent DMG file, click to let OS X open it. Inside you will find the DiffMerge Application bundle. This application bundle is completely self-contained. Simply drag it to your /Applications folder. A short-cut to your /Applications folder is provided inside the DMG next to the DiffMerge Application bundle.
Extras: Also included on the DMG is an Extras folder containing things you may find useful. These are for your convenience; DiffMerge uses copies that are inside the DiffMerge Application bundle.
A sample shell script is also provided to make it easier to use DiffMerge from the command line. You will need to edit it to set the pathname to the DiffMerge Application bundle if you installed it to a location other than /Applications.
To install these extras:
sudo cp Extras/diffmerge.sh /usr/local/bin/diffmerge sudo chmod 755 /usr/local/bin/diffmerge sudo cp Extras/diffmerge.1 /usr/share/man/man1/diffmerge.1 sudo chmod 644 /usr/share/man/man1/diffmerge.1
