summaryrefslogtreecommitdiff
path: root/tests/merge
Commit message (Expand)AuthorAgeFilesLines
* annotated_commit: add failing test for looking up from annotated tagCarlos Martín Nieto2018-12-141-0/+26
* object_type: use new enumeration namesethomson/index_fixesEdward Thomson2018-12-013-11/+11
* Merge pull request #4770 from tiennou/feature/merge-analysis-any-branchPatrick Steinhardt2018-11-301-20/+49
|\
| * merge: make analysis possible against a non-HEAD referenceEtienne Samson2018-10-191-20/+49
* | Merge branch 'issue-4203'Edward Thomson2018-10-201-0/+29
|\ \ | |/ |/|
| * tests: add test case for index reloads on mergeEtiene Dalcol2017-11-111-0/+29
* | Merge pull request #4702 from tiennou/fix/coverityPatrick Steinhardt2018-07-201-1/+1
|\ \
| * | tests: add missing cl_git_pass to testsEtienne Samson2018-07-061-1/+1
* | | treewide: remove use of C++ style commentsPatrick Steinhardt2018-07-1312-12/+12
|/ /
* | Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt2018-06-109-30/+30
* | Add failing test case for virtual commit merge base issueEdward Thomson2018-02-041-0/+23
* | merge::trees::recursive: test for virtual base buildingEdward Thomson2018-02-041-0/+25
* | merge: reverse merge bases for recursive mergeEdward Thomson2018-02-043-21/+21
* | Merge pull request #4489 from libgit2/ethomson/conflicts_crlfEdward Thomson2018-02-041-0/+48
|\ \
| * | merge: test CR/LF conflicts for CR/LF filesethomson/conflicts_crlfEdward Thomson2018-01-211-0/+48
* | | merge: recursive uses larger conflict markersEdward Thomson2018-01-213-8/+8
|/ /
* | Do not attempt to check out submodule as blob when merging a submodule modify...David Turner2017-12-041-0/+36
|/
* merge_trees: introduce test for submodule renamesEdward Thomson2017-02-091-0/+22
* merge: set default rename thresholdEdward Thomson2017-01-011-0/+2
* git_diff_generated: abstract generated diffsEdward Thomson2016-05-261-0/+1
* merge drivers: handle configured but not found driverEdward Thomson2016-03-171-0/+18
* merge driver: remove `check` callbackEdward Thomson2016-03-171-124/+7
* merge driver: tests for set and unset merge attributeEdward Thomson2016-03-171-1/+36
* merge driver: tests for custom default merge driversEdward Thomson2016-03-171-0/+59
* merge driver: test GIT_EMERGECONFLICTEdward Thomson2016-03-171-0/+90
* merge driver: test GIT_PASSTHROUGHEdward Thomson2016-03-171-0/+95
* merge driver: introduce custom merge driversEdward Thomson2016-03-171-0/+208
* Fix rebase bug and include test for merge=unionStan Hu2016-03-171-0/+36
* merge::workdir::dirty: update to use `st_ctime_nsec`Edward Thomson2016-03-071-2/+2
* win32: introduce p_timeval that isn't stupidEdward Thomson2016-02-121-1/+1
* merge tests: correct castsEdward Thomson2016-02-111-3/+3
* recursive merge: add a recursion limitEdward Thomson2015-11-251-0/+31
* merge: handle conflicts in recursive base buildingEdward Thomson2015-11-253-1/+145
* merge tests: add complex recursive exampleEdward Thomson2015-11-251-0/+28
* recursive: test conflict output during recursive mergeEdward Thomson2015-11-252-0/+81
* merge tests: move expected data into own fileEdward Thomson2015-11-256-44/+47
* merge: add recursive test with conflicting contentsEdward Thomson2015-11-251-0/+23
* merge: add recursive test with three merge basesEdward Thomson2015-11-251-0/+46
* merge: improve test names in recursive merge testsEdward Thomson2015-11-251-8/+8
* merge: add a third-level recursive mergeEdward Thomson2015-11-251-0/+46
* merge: add a second-level recursive mergeEdward Thomson2015-11-251-2/+48
* merge: add simple recursive testEdward Thomson2015-11-252-1/+112
* merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson2015-11-253-5/+5
* Merge pull request #3170 from CmdrMoozy/nsec_fixCarlos Martín Nieto2015-11-121-1/+6
|\
| * cmake: Only provide USE_NSEC if struct stat members are avilable.Axel Rasmussen2015-09-181-2/+1
| * cmake: add USE_NSEC, and only check nanosec m/ctime if enabledAxel Rasmussen2015-09-181-1/+7
* | merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson2015-10-222-5/+22
* | diff: don't feed large files to xdiffEdward Thomson2015-10-051-3/+3
* | merge_file: treat large files as binaryEdward Thomson2015-10-051-0/+88
|/
* iterator: use an options struct instead of argsEdward Thomson2015-08-281-6/+6
View Lorry Controller Status