diff options
| author | Ben Straub <bs@github.com> | 2013-10-03 06:20:20 -0700 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2013-10-03 06:20:20 -0700 |
| commit | fc1f7d4f15ecc3f42dbde7fc0a30933cb89152bc (patch) | |
| tree | 1446cb018eb05571b4eff101ceae937688e83a1d /tests-clar/clar_libgit2.c | |
| parent | de8fe729efd350ae5cb1ef25ffb08f92c6f706b9 (diff) | |
| parent | ab1368766240cfe861729642abe1cddd01c0203e (diff) | |
| download | libgit2-fc1f7d4f15ecc3f42dbde7fc0a30933cb89152bc.tar.gz | |
Merge branch 'development' into blame
Conflicts:
include/git2.h
Diffstat (limited to 'tests-clar/clar_libgit2.c')
| -rw-r--r-- | tests-clar/clar_libgit2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests-clar/clar_libgit2.c b/tests-clar/clar_libgit2.c index 555af38db..6063bf91c 100644 --- a/tests-clar/clar_libgit2.c +++ b/tests-clar/clar_libgit2.c @@ -440,7 +440,7 @@ void clar__assert_equal_file( int ignore_cr, const char *path, const char *file, - size_t line) + int line) { char buf[4000]; ssize_t bytes, total_bytes = 0; |