Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/libgit2.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests/merge
AgeCommit message (Expand)Author
2018-07-20Merge pull request #4702 from tiennou/fix/coverityPatrick Steinhardt
2018-07-13treewide: remove use of C++ style commentsPatrick Steinhardt
2018-07-06tests: add missing cl_git_pass to testsEtienne Samson
2018-06-10Convert usage of `git_buf_free` to new `git_buf_dispose`Patrick Steinhardt
2018-02-04Add failing test case for virtual commit merge base issueEdward Thomson
2018-02-04merge::trees::recursive: test for virtual base buildingEdward Thomson
2018-02-04merge: reverse merge bases for recursive mergeEdward Thomson
2018-02-04Merge pull request #4489 from libgit2/ethomson/conflicts_crlfEdward Thomson
2018-01-21merge: test CR/LF conflicts for CR/LF filesEdward Thomson
2018-01-21merge: recursive uses larger conflict markersEdward Thomson
2017-12-05Do not attempt to check out submodule as blob when merging a submodule modify...David Turner
2017-02-09merge_trees: introduce test for submodule renamesEdward Thomson
2017-01-02merge: set default rename thresholdEdward Thomson
2016-05-26git_diff_generated: abstract generated diffsEdward Thomson
2016-03-17merge drivers: handle configured but not found driverEdward Thomson
2016-03-17merge driver: remove `check` callbackEdward Thomson
2016-03-17merge driver: tests for set and unset merge attributeEdward Thomson
2016-03-17merge driver: tests for custom default merge driversEdward Thomson
2016-03-17merge driver: test GIT_EMERGECONFLICTEdward Thomson
2016-03-17merge driver: test GIT_PASSTHROUGHEdward Thomson
2016-03-17merge driver: introduce custom merge driversEdward Thomson
2016-03-17Fix rebase bug and include test for merge=unionStan Hu
2016-03-07merge::workdir::dirty: update to use `st_ctime_nsec`Edward Thomson
2016-02-12win32: introduce p_timeval that isn't stupidEdward Thomson
2016-02-11merge tests: correct castsEdward Thomson
2015-11-26recursive merge: add a recursion limitEdward Thomson
2015-11-25merge: handle conflicts in recursive base buildingEdward Thomson
2015-11-25merge tests: add complex recursive exampleEdward Thomson
2015-11-25recursive: test conflict output during recursive mergeEdward Thomson
2015-11-25merge tests: move expected data into own fileEdward Thomson
2015-11-25merge: add recursive test with conflicting contentsEdward Thomson
2015-11-25merge: add recursive test with three merge basesEdward Thomson
2015-11-25merge: improve test names in recursive merge testsEdward Thomson
2015-11-25merge: add a third-level recursive mergeEdward Thomson
2015-11-25merge: add a second-level recursive mergeEdward Thomson
2015-11-25merge: add simple recursive testEdward Thomson
2015-11-25merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`Edward Thomson
2015-11-12Merge pull request #3170 from CmdrMoozy/nsec_fixCarlos Martín Nieto
2015-10-22merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson
2015-10-05diff: don't feed large files to xdiffEdward Thomson
2015-10-05merge_file: treat large files as binaryEdward Thomson
2015-09-19cmake: Only provide USE_NSEC if struct stat members are avilable.Axel Rasmussen
2015-09-19cmake: add USE_NSEC, and only check nanosec m/ctime if enabledAxel Rasmussen
2015-08-29iterator: use an options struct instead of argsEdward Thomson
2015-07-12Merge branch 'portable-zu'Carlos Martín Nieto
2015-07-12Fix #3094 - improve use of portable size_t/ssize_t format specifiers.Matthew Plough
2015-07-08merge_files: don't add trailing newlinesEdward Thomson
2015-06-22merge: work around write-side racy protection when hacking the indexCarlos Martín Nieto
2015-06-16merge::workdir::dirty: tick idx to defeat racy-gitEdward Thomson
2015-05-28introduce `git_index_entry_is_conflict`Edward Thomson
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 18:20:08 +0300