diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-12-23 10:23:08 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-03-17 11:02:26 -0400 |
| commit | 3f04219fcdcbc6369270eaf2d878d4fe7064254d (patch) | |
| tree | 38163746ebb430e787d7a82bdec44cac5d82df4c /include/git2/sys/commit.h | |
| parent | 7a74590d8f952971088a90c584945ceefe1bf90e (diff) | |
| download | libgit2-3f04219fcdcbc6369270eaf2d878d4fe7064254d.tar.gz | |
merge driver: introduce custom merge drivers
Consumers can now register custom merged drivers with
`git_merge_driver_register`. This allows consumers to support the
merge drivers, as configured in `.gitattributes`. Consumers will be
asked to perform the file-level merge when a custom driver is
configured.
Diffstat (limited to 'include/git2/sys/commit.h')
0 files changed, 0 insertions, 0 deletions