heckdiff

A three-way merge library for all the extensions for file (not yet, my hope).