diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-23 23:52:03 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-23 23:52:03 -0400 |
| commit | cc605e73acad8b665c3b89a645eae9de4299774b (patch) | |
| tree | e8430d68e5cde36cefc94b83191218f5b651162b /tests/diff/binary.c | |
| parent | 09f3364d7a9fd061e3c624a1f7b118b312fd825c (diff) | |
| parent | 8d8a2eefef0fbb42d7a7fb8f88ca7481515e2737 (diff) | |
| download | libgit2-cc605e73acad8b665c3b89a645eae9de4299774b.tar.gz | |
Merge pull request #3222 from git-up/conflicted
Fixed GIT_DELTA_CONFLICTED not returned in some cases
Diffstat (limited to 'tests/diff/binary.c')
0 files changed, 0 insertions, 0 deletions