summaryrefslogtreecommitdiffstats
path: root/t/t6428-merge-conflicts-sparse.sh (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Adding upstream version 1:2.39.2.upstream/1%2.39.2upstreamDaniel Baumann2024-04-071-0/+145
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>