diff options
| author | Pierre-Olivier Latour <pol@mac.com> | 2015-06-17 08:55:09 -0700 |
|---|---|---|
| committer | Pierre-Olivier Latour <pol@mac.com> | 2015-06-22 21:37:41 -0700 |
| commit | cb63e7e8971134e41e99a7010d9b2ad54e6639ff (patch) | |
| tree | a8fde7d90bac3c3c578534c54a5c01da65019286 /tests/diff/diffiter.c | |
| parent | 91c1833af1bdc0680b42e9f2934665330f826c18 (diff) | |
| download | libgit2-cb63e7e8971134e41e99a7010d9b2ad54e6639ff.tar.gz | |
Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()
This fixes a bug where if a file was in conflicted state in either diff,
it would not always remain in conflicted state in the merged diff.
Diffstat (limited to 'tests/diff/diffiter.c')
0 files changed, 0 insertions, 0 deletions