summaryrefslogtreecommitdiffstats
path: root/tests/t-conffile-conflict (follow)
Commit message (Expand)AuthorAgeFilesLines
* Adding upstream version 1.21.22.upstream/1.21.22upstreamDaniel Baumann2024-04-0710-0/+75