diff options
| author | Alan Rogers <alan@github.com> | 2014-07-22 15:08:24 +1000 |
|---|---|---|
| committer | Alan Rogers <alan@github.com> | 2014-07-22 15:08:24 +1000 |
| commit | 7d0ab0fae04015e0bc66ff16beae495f13969b10 (patch) | |
| tree | 09323e451046ef9dfa6f83754c3fe1fb3d327b48 /src/merge.h | |
| parent | e824e63de6724557946ba155034ff8c864f594d2 (diff) | |
| parent | 091165c53b2bcd5d41fb71d43ed5a23a3d96bf5d (diff) | |
| download | libgit2-7d0ab0fae04015e0bc66ff16beae495f13969b10.tar.gz | |
Merge remote-tracking branch 'origin/master' into fix-git-status-list-new-unreadable-folder
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.h b/src/merge.h index 00f6197bf..cc17389ab 100644 --- a/src/merge.h +++ b/src/merge.h @@ -149,7 +149,7 @@ int git_merge__setup( const git_merge_head *heads[], size_t heads_len); -int git_merge__indexes(git_repository *repo, git_index *index_new); +int git_merge__check_result(git_repository *repo, git_index *index_new); int git_merge__append_conflicts_to_merge_msg(git_repository *repo, git_index *index); |