anchor/retcon — pull request #107 by thsutton (2014-10-24 06:37:28+00:00)
Title: Make "list conflicts" work

Make the "list conflicts" operation work.

There are numerous problems in here, but it does seem to work.