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/trees
AgeCommit message (Expand)Author
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-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-10-22merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICTEdward Thomson
2015-08-29iterator: use an options struct instead of argsEdward Thomson
2015-05-28introduce `git_index_entry_is_conflict`Edward Thomson
2015-05-11merge: merge iteratorsEdward Thomson
2015-03-16Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys
2015-03-16Renamed git_merge_options 'flags' to 'tree_flags'Jacques Germishuys
2015-03-16Added tests to merge files and branches with whitespace problems and fixesJacques Germishuys
2014-10-01hashsig: Export as a `sys` headerVicent Marti
2014-07-01Introduce cl_assert_equal_oidEdward Thomson
2014-03-20Update git_merge_tree_opts to git_merge_optionsEdward Thomson
2014-03-20Introduce git_merge_file for consumersEdward Thomson
2014-01-25index: rename an entry's id to 'id'Carlos Martín Nieto
2014-01-21Remove the "merge none" flagEdward Thomson
2014-01-21merge_file should use more aggressive levelsEdward Thomson
2013-12-09Clean up warningsEdward Thomson
2013-12-03Bare naked merge and rebaseEdward Thomson
2013-11-15Rename tests-clar to testsBen Straub
    generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 06:58:16 +0300