diff options
| -rw-r--r-- | tests-clar/merge/workdir/trivial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests-clar/merge/workdir/trivial.c b/tests-clar/merge/workdir/trivial.c index d20d89879..9f9566243 100644 --- a/tests-clar/merge/workdir/trivial.c +++ b/tests-clar/merge/workdir/trivial.c @@ -62,7 +62,7 @@ static int merge_trivial(const char *ours, const char *theirs, bool automerge) return 0; } -static int merge_trivial_conflict_entrycount(void) +static size_t merge_trivial_conflict_entrycount(void) { const git_index_entry *entry; size_t count = 0; |