Name |
Last commit
|
Last update |
---|---|---|
.. | ||
trees | ||
workdir | ||
conflict_data.h | ||
driver.c | ||
files.c | ||
merge_helpers.c | ||
merge_helpers.h |
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.
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
trees | Loading commit data... | |
workdir | Loading commit data... | |
conflict_data.h | Loading commit data... | |
driver.c | Loading commit data... | |
files.c | Loading commit data... | |
merge_helpers.c | Loading commit data... | |
merge_helpers.h | Loading commit data... |