tree 5ef06d05375f6e5cb8c314c3d60b1d8f4c876fe0
parent 9efca87e6c099f8e6b9046c31f62e837a4ba4615
parent bc17e4bb11196d82cbbc7d80bd195b08a4e5b4d5
author Matt Farina <matt@mattfarina.com> 1465221894 -0400
committer Matt Farina <matt@mattfarina.com> 1465221894 -0400

Merge pull request #459 from Masterminds/feat/conflict-versions

Add tag, if one exists, to display of commit info in conflicts.