summaryrefslogtreecommitdiffstats
path: root/test/integration/test-conflicts-loop (unfollow)
Commit message (Collapse)AuthorFilesLines
2024-04-07Adding upstream version 2.6.1.upstream/2.6.1upstreamDaniel Baumann1-0/+33
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>