Commit cb63e7e8971134e41e99a7010d9b2ad54e6639ff
2015-06-17T08:55:09
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.