summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve/.gitted/objects/29 (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merging upstream version 1.8.1+ds.Daniel Baumann2024-05-211-0/+0
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 06:34:46 +0000