]> git.proxmox.com Git - libgit2.git/commit - src/merge_file.c
projects / libgit2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 13de936) | patch
Added options to enable patience and minimal diff drivers
authorJacques Germishuys <jacquesg@striata.com>
Thu, 12 Mar 2015 11:16:09 +0000 (13:16 +0200)
committerJacques Germishuys <jacquesg@striata.com>
Mon, 16 Mar 2015 07:53:27 +0000 (09:53 +0200)
commit74c37c2a48756299306bb10e9e546c1627ca289f
tree33754c0585b084657059fd9cbac98e0920119cd5tree
parent13de93631664cd6eec3afedabb7145d5562a3e01commit | diff
Added options to enable patience and minimal diff drivers
include/git2/merge.h diff | blob | blame | history
src/merge_file.c diff | blob | blame | history
The git library used in some Proxmox tool chains