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