diff options
Diffstat (limited to 'tests-clar/merge/trees/trivial.c')
| -rw-r--r-- | tests-clar/merge/trees/trivial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests-clar/merge/trees/trivial.c b/tests-clar/merge/trees/trivial.c index 7d8d2cbf5..e6096e2dc 100644 --- a/tests-clar/merge/trees/trivial.c +++ b/tests-clar/merge/trees/trivial.c @@ -67,7 +67,7 @@ static int merge_trivial(git_index **index, const char *ours, const char *theirs static int merge_trivial_conflict_entrycount(git_index *index) { const git_index_entry *entry; - size_t count = 0; + int count = 0; size_t i; for (i = 0; i < git_index_entrycount(index); i++) { |