summaryrefslogtreecommitdiffstats
path: root/builtin/merge-file.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Adding upstream version 1:2.39.2.upstream/1%2.39.2upstreamDaniel Baumann2024-04-071-0/+124