diff options
| author | Pierre-Olivier Latour <pol@mac.com> | 2015-06-10 10:09:10 -0700 |
|---|---|---|
| committer | Pierre-Olivier Latour <pol@mac.com> | 2015-06-10 10:09:10 -0700 |
| commit | 50456801c017e22696b9d756daf3a4a66e6b9bb8 (patch) | |
| tree | 440105769c6eabeece4dcd888b33baa23a2e8480 /src/commit.c | |
| parent | da6720fcc5d9f368e7aa562384439498c1bf307e (diff) | |
| download | libgit2-50456801c017e22696b9d756daf3a4a66e6b9bb8.tar.gz | |
Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()
git_diff_find_similar() now ignores git_diff_delta records with a status
of GIT_DELTA_CONFLICTED, which fixes a crash due to assert() being hit.
Diffstat (limited to 'src/commit.c')
0 files changed, 0 insertions, 0 deletions