]> git.proxmox.com Git - libgit2.git/commit - tests/diff/workdir.c
projects / libgit2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 91c1833) | patch
Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()
authorPierre-Olivier Latour <pol@mac.com>
Wed, 17 Jun 2015 15:55:09 +0000 (08:55 -0700)
committerPierre-Olivier Latour <pol@mac.com>
Tue, 23 Jun 2015 04:37:41 +0000 (21:37 -0700)
commitcb63e7e8971134e41e99a7010d9b2ad54e6639ff
treea8fde7d90bac3c3c578534c54a5c01da65019286tree
parent91c1833af1bdc0680b42e9f2934665330f826c18commit | diff
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.
src/diff_tform.c diff | blob | blame | history
tests/diff/workdir.c diff | blob | blame | history
The git library used in some Proxmox tool chains