aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6403-merge-file.sh
AgeCommit message (Expand)AuthorFilesLines
2023-11-22merge-file: add --diff-algorithm optionAntonin Delpeuch1-1/+123
2023-11-02merge-file: add an option to process object IDsbrian m. carlson1-0/+58
2022-07-01merge-file: fix memory leaks on error pathÆvar Arnfjörð Bjarmason1-0/+2
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+390