proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-07-24 07:05:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1955 from linquize/trivial.c-warning

Browse Source 
Fix warning in tests-clar/merge/workdir/trivial.c
This commit is contained in:
Vicent Martí 2013-11-10 08:19:32 -08:00
commit 5e1281f873
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests-clar/merge/workdir/trivial.c
View File

@ -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;