summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve/.gitted/objects/47/8172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Adding upstream version 1.7.2+ds.upstream/1.7.2+dsDaniel Baumann2024-05-041-0/+0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>