From 18bd73e50d21087e09a7193e55504b981c163e46 Mon Sep 17 00:00:00 2001 From: Linquize Date: Mon, 11 Nov 2013 00:08:54 +0800 Subject: [PATCH] Fix warning in tests-clar/merge/workdir/trivial.c --- tests-clar/merge/workdir/trivial.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;