diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-01-04 01:53:50 +0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-01-04 01:53:50 +0400 |
| commit | ad2bc32fa3e6958c2d975838712d6e3552abb838 (patch) | |
| tree | 2426bf188ae68224a69e518e4b31eddfad92acc0 /src/reset.c | |
| parent | 07871d3adcfdaba7ad5f99f89299258d1dbd92f9 (diff) | |
expose merge metadata cleanup
Diffstat (limited to 'src/reset.c')
| -rw-r--r-- | src/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reset.c b/src/reset.c index 17b4b900c..784094a1f 100644 --- a/src/reset.c +++ b/src/reset.c @@ -126,7 +126,7 @@ int git_reset( goto cleanup; } - if ((error = git_merge__cleanup(repo)) < 0) { + if ((error = git_repository_merge_cleanup(repo)) < 0) { giterr_set(GITERR_INDEX, "%s - Failed to clean up merge data.", ERROR_MSG); goto cleanup; } |