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.

Sign up for GitHub

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

Jump to bottom

Fix error when merging files with unicode content. #505

Merged
merged 1 commit into from Mar 19, 2015
Merged

Fix error when merging files with unicode content. #505

merged 1 commit into from Mar 19, 2015

Conversation

pks-t
Copy link
Member

@pks-t pks-t commented Mar 19, 2015

When merging index entries where the corresponding files contain Unicode
codepoints an error is thrown. Decode the C string using UTF-8 to fix the issue
and adjust the test case for merging files to contain umlauts to catch such
errors.

@pks-t
Fix error when merging files with unicode content.
cf56a69 
When merging index entries where the corresponding files contain Unicode
codepoints an error is thrown. Decode the C string using UTF-8 to fix the issue
and adjust the test case for merging files to contain umlauts to catch such
errors.
@jdavid jdavid merged commit cf56a69 into libgit2:master Mar 19, 2015
@pks-t pks-t deleted the fix-unicode-merge-conflicts branch April 13, 2015 06:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@pks-t @jdavid