aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7615/ours.c
AgeCommit message (Expand)AuthorFilesLines
2024-07-13merge-recursive: honor diff.algorithmAntonin Delpeuch1-0/+17