summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/objects/d6
Commit message (Expand)AuthorAgeFilesLines
* Rename tests-clar to testsBen Straub2013-11-143-0/+2