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
..
git2	merge driver: introduce custom merge drivers	2016-03-17 11:02:26 -04:00
git2.h	Include git2/transaction.h	2015-05-31 19:22:12 +02:00