summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve/.gitted/objects (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merging upstream version 1.8.1+ds.Daniel Baumann2024-05-2111-0/+8
* Adding upstream version 1.7.2+ds.upstream/1.7.2+dsDaniel Baumann2024-05-04358-0/+126