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
..
trees	recursive merge: add a recursion limit	2015-11-25 16:25:47 -05:00
workdir	Fix rebase bug and include test for merge=union	2016-03-17 11:02:26 -04:00
conflict_data.h	merge: handle conflicts in recursive base building	2015-11-25 15:38:39 -05:00
driver.c	merge driver: introduce custom merge drivers	2016-03-17 11:02:26 -04:00
files.c	merge tests: move expected data into own file	2015-11-25 15:38:22 -05:00
merge_helpers.c	merge: add simple recursive test	2015-11-25 15:37:11 -05:00
merge_helpers.h	merge tests: move expected data into own file	2015-11-25 15:38:22 -05:00