delta/libgit2.git - github.com: libgit2/libgit2.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	merge drivers: handle configured but not found driver	Edward Thomson	2016-03-17	1	-0/+18
\|
*	merge driver: remove `check` callback	Edward Thomson	2016-03-17	1	-124/+7
\| \| \| \| \| \|	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.
*	merge driver: tests for set and unset merge attribute	Edward Thomson	2016-03-17	1	-1/+36
\| \| \| \| \| \| \|	Ensure that setting the merge attribute forces the built-in default `text` driver and does not honor the `merge.default` configuration option. Further ensure that unsetting the merge attribute forces a conflict (the `binary` driver).
*	merge driver: tests for custom default merge drivers	Edward Thomson	2016-03-17	1	-0/+59
\|
*	merge driver: test GIT_EMERGECONFLICT	Edward Thomson	2016-03-17	1	-0/+90
\| \| \| \| \|	When a `check` or `apply` callback function returns `GIT_EMERGECONFLICT` stop and product a conflict.
*	merge driver: test GIT_PASSTHROUGH	Edward Thomson	2016-03-17	1	-0/+95
\| \| \| \| \|	When a `check` or `apply` callback function returns `GIT_PASSTHROUGH`, move on to the default merge driver.
*	merge driver: introduce custom merge drivers	Edward Thomson	2016-03-17	1	-0/+208
	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.