diff options
| author | Edward Thomson <ethomson@github.com> | 2016-02-28 09:34:11 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-03-17 11:06:00 -0400 |
| commit | 6d8b2cdbee00f2c4e97796b52e05dd39bd655138 (patch) | |
| tree | a00499e01bdfa09dc75f90c71055d1b872bd6dd5 /src/merge.h | |
| parent | 3f7d3df1ecc0ed7c31427aa37a8de62026c7edef (diff) | |
| download | libgit2-6d8b2cdbee00f2c4e97796b52e05dd39bd655138.tar.gz | |
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.
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/merge.h b/src/merge.h index 68290e7cf..f8cac161f 100644 --- a/src/merge.h +++ b/src/merge.h @@ -145,12 +145,6 @@ int git_merge_diff_list__find_renames(git_repository *repo, git_merge_diff_list void git_merge_diff_list__free(git_merge_diff_list *diff_list); -/* Merge driver configuration */ -int git_merge_driver_for_source( - git_merge_driver **driver_out, - void **data_out, - const git_merge_driver_source *src); - /* Merge metadata setup */ int git_merge__setup( |