Fix warning in tests-clar/merge/workdir/trivial.c

This commit is contained in:
Linquize 2013-11-11 00:08:54 +08:00
parent a1d35ede18
commit 18bd73e50d

View File

@ -62,7 +62,7 @@ static int merge_trivial(const char *ours, const char *theirs, bool automerge)
return 0; return 0;
} }
static int merge_trivial_conflict_entrycount(void) static size_t merge_trivial_conflict_entrycount(void)
{ {
const git_index_entry *entry; const git_index_entry *entry;
size_t count = 0; size_t count = 0;