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.c | |
| 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.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 1386d0908..dfdadca81 100644 --- a/src/merge.c +++ b/src/merge.c @@ -15,7 +15,7 @@ #include "git2/reset.h" #include "commit_list.h" -int git_merge__cleanup(git_repository *repo) +int git_repository_merge_cleanup(git_repository *repo) { int error = 0; git_buf merge_head_path = GIT_BUF_INIT, |