summaryrefslogtreecommitdiff
path: root/tests-clar/index/conflicts.c
Commit message (Expand)AuthorAgeFilesLines
* Rename tests-clar to testsBen Straub2013-11-141-287/+0
* introduce git_conflict_iteratorEdward Thomson2013-05-171-3/+48
* Use cl_assert_equal_s() instead of strcmp().Sebastian Bauer2013-01-251-2/+2
* add an index_remove_bypath that removes conflicts, renamed add_from_workdir t...Edward Thomson2013-01-121-2/+21
* Fix warnings on Win64 buildRussell Belfer2012-11-271-1/+1
* API updates for index.hBen Straub2012-11-271-3/+3
* Reset all static variables to NULL in clar's __cleanupSascha Cunz2012-11-231-0/+2
* index: Introduce git_index_has_conflicts()nulltoken2012-11-081-0/+4
* index refactoringEdward Thomson2012-10-291-0/+217