summaryrefslogtreecommitdiffstats
path: root/t/t6404-recursive-merge.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ak/corrected-commit-date'Junio C Hamano2021-02-181-1/+4
|\
| * commit-reach: use corrected commit dates in paint_down_to_common()Abhishek Kumar2021-01-191-1/+4
* | t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-201-3/+3
* | tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-201-0/+3
|/
* t6404, t6423: expect improved rename/delete handling in ort backendElijah Newren2020-10-261-2/+12
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+131