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

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