CALAMARI

CALAMARI is a bit like SQUID, but different. It has the same blending-slider diff technology, with the added bonus of using the per-pixel diff identification system to do three-way merges.

Like SQUID before it, CALAMARI was designed for use with Perforce, but can be used with other asset management systems or on its own. CALAMARI dwells in the murky depths of the Perforce Public Depot.

Windows installation:

Download calamari.zip.

Extract it to a directory that's in your PATH, such as your Perforce install directory.

If you use an asset management system (like Perforce) that allows you to use external diff/merge tools, you can now specify "calamari" as the application for diffing and merging images (.PNG, .BMP, etc).

Command line usage:

calamari file1 file2
calamari base theirs yours [result]

CALAMARI comes with a help file that should be enough to get you started using it. You can also click here for a brief demo of CALAMARI being used to merge files.

Contact me: spamwise at gmail dot com. Questions, suggestions, and feedback welcomed.

Disclaimer: this tool is completely unsupported by Perforce Software, Inc.

Back to the LeadToGold.com software directory