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
2014-02-06Prevent user's merge.conflictstyle from breaking testsBen Straub
2014-02-06Fix a few references to changed function signaturesBen Straub
2014-02-06Merge remote-tracking branch 'libgit2/development' into bs/more-reflog-stuffBen Straub
2014-02-04Test that emulates a strange filter implementationEdward Thomson
2014-02-04Tests merging staged files identical to resultEdward Thomson
2014-02-04Tests merge when changes exist in workdir/indexEdward Thomson
2014-02-04Add reflog parameters to git_resetBen Straub
2014-01-25merge: rename _oid() -> id()Carlos Martín Nieto
2014-01-25index: rename an entry's id to 'id'Carlos Martín Nieto
2014-01-21Merge submodulesEdward Thomson
2014-01-21Support union mergesEdward Thomson
2014-01-21Remove the "merge none" flagEdward Thomson
2014-01-21Load merge.conflictstyle setting from configEdward Thomson
2014-01-21Introduce diff3 mode for checking out conflictsEdward Thomson
2014-01-21Don't try to merge binary filesEdward Thomson
2014-01-21merge_file should use more aggressive levelsEdward Thomson
2014-01-15refs: remove the _with_log differentiationCarlos Martín Nieto
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 22:23:44 +0300