tree 3a01c726484fd03382b21086a5ed7c16ebcfdabb
parent 815d933fc6de40fb433c05b5e717716f0129013d
author Matt Farina <matt@mattfarina.com> 1458761995 -0400
committer Matt Farina <matt@mattfarina.com> 1458761995 -0400

First pass at more detailed conflict information