Resolve

A software for AST-based diff calculation, display, and automated resolution. Written in C++ and CL, you'll find Lisp utilities.