summaryrefslogtreecommitdiffstats
path: root/tests/t-file-conflicts/Makefile (follow)
Commit message (Expand)AuthorAgeFilesLines
* Adding upstream version 1.22.4.upstream/1.22.4Daniel Baumann2024-04-151-0/+15
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 05:33:27 +0000