Diff - 971a86c8e2f62491af414e021fccb61d7775d97a^2..971a86c8e2f62491af414e021fccb61d7775d97a - third_party/Masterminds/glide - Git at Google

commit: 971a86c8e2f62491af414e021fccb61d7775d97a
[log] [tgz]
author: Matt Farina <matt@mattfarina.com>
Mon Jun 06 10:04:54 2016 -0400
committer: Matt Farina <matt@mattfarina.com>
Mon Jun 06 10:04:54 2016 -0400
tree: 5ef06d05375f6e5cb8c314c3d60b1d8f4c876fe0
parent: 9efca87e6c099f8e6b9046c31f62e837a4ba4615 [diff]
parent: bc17e4bb11196d82cbbc7d80bd195b08a4e5b4d5 [diff]

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

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