diff options
| author | Vicent Martà <vicent@github.com> | 2013-01-03 13:57:17 -0800 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-01-03 13:57:17 -0800 |
| commit | b449a9ae8c9ac17652c5ab006859dd29b62a5b48 (patch) | |
| tree | 2426bf188ae68224a69e518e4b31eddfad92acc0 /src/merge.h | |
| parent | 07871d3adcfdaba7ad5f99f89299258d1dbd92f9 (diff) | |
| parent | ad2bc32fa3e6958c2d975838712d6e3552abb838 (diff) | |
| download | libgit2-b449a9ae8c9ac17652c5ab006859dd29b62a5b48.tar.gz | |
Merge pull request #1185 from ethomson/cleanup_merge
expose merge metadata cleanup
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/merge.h b/src/merge.h index 3681e24b7..af24de474 100644 --- a/src/merge.h +++ b/src/merge.h @@ -16,7 +16,6 @@ #define MERGE_CONFIG_FILE_MODE 0666 -int git_merge__cleanup(git_repository *repo); int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_list_node *one, git_vector *twos); #endif |