2 Commits

Author	SHA1	Message	Date
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