summaryrefslogtreecommitdiff
path: root/tests/index/conflicts.c
Commit message (Expand)AuthorAgeFilesLines
* introduce `git_index_entry_is_conflict`Edward Thomson2015-05-281-2/+2
* conflict tests: use GIT_IDXENTRY_STAGE_SETEdward Thomson2015-05-281-10/+10
* index: validate mode of new conflictsEdward Thomson2015-05-281-1/+8
* conflicts: when adding conflicts, remove stagedEdward Thomson2015-05-281-0/+50
* Introduce cl_assert_equal_oidEdward Thomson2014-07-011-13/+13
* index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-251-20/+20
* Rename tests-clar to testsBen Straub2013-11-141-0/+287