diff options
| author | Vicent Martà <vicent@github.com> | 2012-11-10 20:24:53 -0800 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2012-11-10 20:24:53 -0800 |
| commit | d18713fb4ad1ba3d18a75272e1c1c3eb45715aba (patch) | |
| tree | d7ccd21ac63656792ddc7d012076bf054fa18cf9 /tests-clar/index | |
| parent | 29c16698b2014e949af3fce2fb4b9d49a2f2d717 (diff) | |
| parent | f92bcaea499611bf0e6a71e845a2d74c790ea659 (diff) | |
| download | libgit2-d18713fb4ad1ba3d18a75272e1c1c3eb45715aba.tar.gz | |
Merge pull request #1056 from nulltoken/duplicate-tree-entries
Duplicate tree entries
Diffstat (limited to 'tests-clar/index')
| -rw-r--r-- | tests-clar/index/conflicts.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests-clar/index/conflicts.c b/tests-clar/index/conflicts.c index 59df257c5..e101b1659 100644 --- a/tests-clar/index/conflicts.c +++ b/tests-clar/index/conflicts.c @@ -180,8 +180,12 @@ void test_index_conflicts__remove_all_conflicts(void) cl_assert(git_index_entrycount(repo_index) == 8); + cl_assert_equal_i(true, git_index_has_conflicts(repo_index)); + git_index_conflict_cleanup(repo_index); + cl_assert_equal_i(false, git_index_has_conflicts(repo_index)); + cl_assert(git_index_entrycount(repo_index) == 2); for (i = 0; i < git_index_entrycount(repo_index); i++) { |