]> git.proxmox.com Git - libgit2.git/commitdiff
projects / libgit2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e02acbb d953c45)
Merge pull request #3564 from ethomson/merge_drivers
authorCarlos Martín Nieto <carlosmn@github.com>
Thu, 17 Mar 2016 17:01:37 +0000 (18:01 +0100)
committerCarlos Martín Nieto <carlosmn@github.com>
Thu, 17 Mar 2016 17:01:37 +0000 (18:01 +0100)
Custom merge drivers and proper gitattributes `merge` handling


Trivial merge
The git library used in some Proxmox tool chains