diff options
| author | Vicent Martà <tanoku@gmail.com> | 2012-05-02 15:59:02 -0700 |
|---|---|---|
| committer | Vicent Martà <tanoku@gmail.com> | 2012-05-02 15:59:02 -0700 |
| commit | 40879facad0337d954d4904e212af3b36cdb9465 (patch) | |
| tree | aea730551948c67bb1fb88098cf8a67d3ed3211d /tests-clar/diff/diff_helpers.h | |
| parent | 2218fd57a50ceb851cb131939bf0747e072e40f6 (diff) | |
| parent | 3fd99be98a91416dae77d65fe593965a0723fa8c (diff) | |
| download | libgit2-40879facad0337d954d4904e212af3b36cdb9465.tar.gz | |
Merge branch 'new-error-handling' into development
Conflicts:
.travis.yml
include/git2/diff.h
src/config_file.c
src/diff.c
src/diff_output.c
src/mwindow.c
src/path.c
tests-clar/clar_helpers.c
tests-clar/object/tree/frompath.c
tests/t00-core.c
tests/t03-objwrite.c
tests/t08-tag.c
tests/t10-refs.c
tests/t12-repo.c
tests/t18-status.c
tests/test_helpers.c
tests/test_main.c
Diffstat (limited to 'tests-clar/diff/diff_helpers.h')
| -rw-r--r-- | tests-clar/diff/diff_helpers.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests-clar/diff/diff_helpers.h b/tests-clar/diff/diff_helpers.h index 010d156fa..ca8c40177 100644 --- a/tests-clar/diff/diff_helpers.h +++ b/tests-clar/diff/diff_helpers.h @@ -37,6 +37,7 @@ extern int diff_hunk_fn( extern int diff_line_fn( void *cb_data, git_diff_delta *delta, + git_diff_range *range, char line_origin, const char *content, size_t content_len); |