proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-28 02:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,229 Commits 2 Branches 0 Tags 22 MiB
7d307c1edc
Commit Graph

3 Commits

Author SHA1 Message Date
Edward Thomson
7d307c1edc merge driver: test GIT_EMERGECONFLICT 
When a `check` or `apply` callback function returns `GIT_EMERGECONFLICT`
stop and product a conflict.
 2016-03-17 11:02:27 -04:00
Edward Thomson
59f2931465 merge driver: test GIT_PASSTHROUGH 
When a `check` or `apply` callback function returns `GIT_PASSTHROUGH`,
move on to the default merge driver.
 2016-03-17 11:02:27 -04:00
Edward Thomson
3f04219fcd 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.
 2016-03-17 11:02:26 -04:00