workdir.c
55.4 KB
-
Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge() · cb63e7e8This 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.
Pierre-Olivier Latour committed