]> git.proxmox.com Git - libgit2.git/commitdiff
projects / libgit2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91c1833 cb63e7e)
Merge pull request #3228 from git-up/diff_merge
authorCarlos Martín Nieto <cmn@dwim.me>
Tue, 23 Jun 2015 12:08:20 +0000 (14:08 +0200)
committerCarlos Martín Nieto <cmn@dwim.me>
Tue, 23 Jun 2015 12:08:20 +0000 (14:08 +0200)
Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()


Trivial merge
The git library used in some Proxmox tool chains