summaryrefslogtreecommitdiff
path: root/tests/checkout/conflict.c
Commit message (Expand)AuthorAgeFilesLines
* 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