Skip to content

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

Merged
mattfarina merged 1 commit into
masterfrom
feat/conflict-versions
Jun 6, 2016
Merged

Add tag, if one exists, to display of commit info in conflicts.#459
mattfarina merged 1 commit into
masterfrom
feat/conflict-versions

Conversation

@mattfarina

Copy link
Copy Markdown
Member

No description provided.

@mattfarina mattfarina added this to the 0.11 milestone Jun 6, 2016
@mattfarina
mattfarina merged commit 971a86c into master Jun 6, 2016
@mattfarina
mattfarina deleted the feat/conflict-versions branch June 6, 2016 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant