diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-18 16:23:13 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:44:10 -0400 |
| commit | bb815157da1b3545d475a678e4db5292f6a723b2 (patch) | |
| tree | 28c5ebecad2c9cbfbda5af3bf46989db76fc6d0d /tests/diff/diff_helpers.c | |
| parent | 7877146fc2b2a25ce1d8c3be5f15186acf292a27 (diff) | |
| download | libgit2-bb815157da1b3545d475a678e4db5292f6a723b2.tar.gz | |
diff conflicts: add tests for tree to index
Diffstat (limited to 'tests/diff/diff_helpers.c')
| -rw-r--r-- | tests/diff/diff_helpers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/diff/diff_helpers.c b/tests/diff/diff_helpers.c index 47e06f0d8..03862d6b4 100644 --- a/tests/diff/diff_helpers.c +++ b/tests/diff/diff_helpers.c @@ -68,7 +68,7 @@ int diff_file_cb( if ((delta->flags & GIT_DIFF_FLAG_BINARY) != 0) e->files_binary++; - cl_assert(delta->status <= GIT_DELTA_TYPECHANGE); + cl_assert(delta->status <= GIT_DELTA_CONFLICTED); e->file_status[delta->status] += 1; |