summaryrefslogtreecommitdiff
path: root/tests/checkout/conflict.c
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * 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_oid`
| * Introduce cl_assert_equal_oidEdward Thomson2014-07-011-1/+1
| |
* | checkout::conflict tests: only test owner modeEdward Thomson2014-06-261-1/+1
|/ | | | | | | The checkout::conflict type conflict tests were failing because they were overly assertive about the resultant mode, testing group & other bits, which failed miserably for people who had a umask less restrictive than 022. Only test the resultant owner bits.
* 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
| | | | This was not converted when we converted the rest, so do it now.
* Rename tests-clar to testsBen Straub2013-11-141-0/+1127