summaryrefslogtreecommitdiff
path: root/tests/resources/merge-recursive
Commit message (Expand)AuthorAgeFilesLines
* commit-graph: Support lookups of entries in a commit-graphlhchavez2021-01-101-0/+0
* apply tests: ensure we can patch a modified fileEdward Thomson2018-11-051-0/+0
* Add failing test case for virtual commit merge base issueEdward Thomson2018-02-0426-0/+9
* Introduce additional criss-cross merge branchesEdward Thomson2018-02-0468-0/+11
* merge: handle conflicts in recursive base buildingEdward Thomson2015-11-2524-0/+8
* merge tests: add complex recursive exampleEdward Thomson2015-11-2511-6/+11
* merge: add recursive test with conflicting contentsEdward Thomson2015-11-258-0/+9
* merge: add recursive test with three merge basesEdward Thomson2015-11-2527-0/+19
* merge: add a third-level recursive mergeEdward Thomson2015-11-2512-0/+12
* merge: add a second-level recursive mergeEdward Thomson2015-11-2511-0/+9
* merge: add simple recursive testEdward Thomson2015-11-2568-0/+121