Visualize textual merge conflicts
You need to have meld installed.
Using this tool is simple. It is meant to be launched in the out folder, as produced by the diggit conflicts analysis. Then just open a browser to the http://localhost:4567 url.
This tool accept an optional argument to change the default inspected folder and honors the MELD environment variable (meld is used by default).