diff options
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 97c147920..12ff1c91c 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2364,7 +2364,7 @@ done: int git_merge__indexes(git_repository *repo, git_index *index_new) { git_index *index_repo = NULL; - unsigned int index_repo_caps = 0; + int index_repo_caps = 0; git_vector paths = GIT_VECTOR_INIT; size_t index_conflicts = 0, wd_conflicts = 0, conflicts, i; char *path; |