mirror of
https://git.proxmox.com/git/libgit2
synced 2025-07-03 21:59:49 +00:00
Fix warning in tests-clar/merge/workdir/trivial.c
This commit is contained in:
parent
a1d35ede18
commit
18bd73e50d
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user