Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jun 6, 2016

Conversation

mattfarina
Copy link
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