Merge pull request #3204 from git-up/git_diff_find_similar Fixed handling of GIT_DELTA_CONFLICTED in git_diff_find_similar()
2015-06-10T16:42:07