3 Commits

Author	SHA1	Message	Date
Edward Thomson	6d8b2cdbee	merge driver: remove check callback ... Since the `apply` callback can defer, the `check` callback is not necessary. Removing the `check` callback further makes the `payload` unnecessary along with the `cleanup` callback.	2016-03-17 11:06:00 -04:00
Edward Thomson	3f7d3df1ec	merge driver: improve inline documentation	2016-03-17 11:06:00 -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