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

franciscocpg/glide,cmars/tools,avvmoto/glide,cmars/tools,cmars/tools,cmars/tools,franciscocpg/glide,avvmoto/glide