tree 2fb80a70b883e7c0f8988ab6cc90cd6429922095
parent 9d3f510bad14b8d2304d233164415a35c660d3c2
author Matt Farina <matt@mattfarina.com> 1458781620 -0400
committer Matt Farina <matt@mattfarina.com> 1458781620 -0400

Display commit information when conflict involves a commit