From bb815157da1b3545d475a678e4db5292f6a723b2 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Mon, 18 May 2015 16:23:13 -0400 Subject: diff conflicts: add tests for tree to index --- tests/diff/diff_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/diff/diff_helpers.c') 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; -- cgit v1.2.1