summaryrefslogtreecommitdiff
path: root/tests/checkout/conflict.c
Commit message (Expand)AuthorAgeFilesLines
* path: separate git-specific path functions from utilEdward Thomson2021-11-091-12/+12
* str: introduce `git_str` for internal, `git_buf` is externalethomson/gitstrEdward Thomson2021-10-171-19/+19
* fileops: rename to "futils.h" to match function signaturesPatrick Steinhardt2019-07-201-1/+1
* configuration: cvar -> configmapPatrick Steinhardt2019-07-181-1/+1
* object_type: use new enumeration namesethomson/index_fixesEdward Thomson2018-12-011-1/+1
* index: use new enum and structure namesEdward Thomson2018-12-011-1/+1
* checkout tests: test symlinks based on support, not platformEdward Thomson2018-10-201-48/+56
* tests: add missing cl_git_pass to testsEtienne Samson2018-07-061-15/+15
* Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt2018-06-101-5/+5
* checkout test: mark unused varsEdward Thomson2015-06-301-1/+4
* conflict tests: use GIT_IDXENTRY_STAGE_SETEdward Thomson2015-05-281-1/+1
* Merge pull request #2567 from cirosantilli/factor-41Vicent Marti2014-09-171-1/+1
|\
| * Factor 40 and 41 constants from source.Ciro Santilli2014-09-161-1/+1
* | Replace void casts with GIT_UNUSED.Ciro Santilli2014-09-171-2/+2
|/
* Merge pull request #2455 from ethomson/equal_oidVicent Marti2014-07-021-1/+1
|\
| * Introduce cl_assert_equal_oidEdward Thomson2014-07-011-1/+1
* | checkout::conflict tests: only test owner modeEdward Thomson2014-06-261-1/+1
|/
* git_checkout_opts -> git_checkout_optionsBen Straub2014-03-061-17/+17
* Prevent user's merge.conflictstyle from breaking testsBen Straub2014-02-051-0/+7
* index: rename an entry's id to 'id'Carlos Martín Nieto2014-01-251-1/+1
* Rename tests-clar to testsBen Straub2013-11-141-0/+1127