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