diff options
| author | Linquize <linquize@yahoo.com.hk> | 2013-11-11 00:08:54 +0800 |
|---|---|---|
| committer | Linquize <linquize@yahoo.com.hk> | 2013-11-11 00:08:54 +0800 |
| commit | 18bd73e50d21087e09a7193e55504b981c163e46 (patch) | |
| tree | 3977f41bd6ad23b5ffe49ab02a9a74917cc79c66 | |
| parent | a1d35ede189f6f3286102c53a499b5e486d86b79 (diff) | |
| download | libgit2-18bd73e50d21087e09a7193e55504b981c163e46.tar.gz | |
Fix warning in tests-clar/merge/workdir/trivial.c
| -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; |