summaryrefslogtreecommitdiff
path: root/tests/merge
Commit message (Expand)AuthorAgeFilesLines
* merge: test CR/LF conflicts for CR/LF filesethomson/conflicts_crlfEdward Thomson2018-01-211-0/+48
* 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
* Merge branch 'portable-zu'Carlos Martín Nieto2015-07-121-1/+1
|\
| * Fix #3094 - improve use of portable size_t/ssize_t format specifiers.Matthew Plough2015-07-121-1/+1
* | merge_files: don't add trailing newlinesEdward Thomson2015-07-071-0/+39
|/
* merge: work around write-side racy protection when hacking the indexCarlos Martín Nieto2015-06-221-1/+14
* merge::workdir::dirty: tick idx to defeat racy-gitEdward Thomson2015-06-161-0/+12
* introduce `git_index_entry_is_conflict`Edward Thomson2015-05-282-2/+2
* merge: merge iteratorsEdward Thomson2015-05-111-1/+13
* Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-162-4/+4
* Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys2015-03-162-4/+4
* Added tests to merge files and branches with whitespace problems and fixesJacques Germishuys2015-03-162-0/+158
* reset: remove reflog message overrideCarlos Martín Nieto2015-03-033-8/+8
* Remove the signature from ref-modifying functionsCarlos Martín Nieto2015-03-035-11/+11
* merge: lock the index at the start of the mergeEdward Thomson2015-02-141-0/+49
* merge test: test an actual failure, not conflictEdward Thomson2015-02-131-6/+5
* Fix broken merge tests due to autocrlf was not falseLinquize2014-12-071-0/+8
View Lorry Controller Status