Skip to content

Conversation

@ethomson
Copy link
Member

We never got around to dealing with conflicts properly in #398. We should do that.

@nulltoken nulltoken merged commit 4bc4857 into libgit2:vNext Jun 19, 2014
@nulltoken
Copy link
Member

👍

@nulltoken nulltoken added this to the v0.19.0 milestone Aug 24, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants