summaryrefslogtreecommitdiffstats
path: root/builtin/merge-file.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merging upstream version 1:2.45.1.Daniel Baumann2024-05-201-0/+28
* Adding upstream version 1:2.43.0.upstream/1%2.43.0Daniel Baumann2024-04-091-0/+156