Merge pull request #3228 from git-up/diff_merge Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()
2015-06-23T14:08:20