diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-10 16:42:07 -0400 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-10 16:42:07 -0400 |
commit | 7f8cd672a13b317aea6aebbf15af2e94a3c6a47c (patch) | |
tree | f527eeb9cfd413c80f492adabc28e5c37f6bd8ee /tests/diff/diff_helpers.h | |
parent | 4e883b5ec7e33ed670fe2a55420c45c5f15bc112 (diff) | |
parent | 50456801c017e22696b9d756daf3a4a66e6b9bb8 (diff) | |
download | libgit2-7f8cd672a13b317aea6aebbf15af2e94a3c6a47c.tar.gz |
Merge pull request #3204 from git-up/git_diff_find_similar
Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()
Diffstat (limited to 'tests/diff/diff_helpers.h')
0 files changed, 0 insertions, 0 deletions