summaryrefslogtreecommitdiff
path: root/tests-clar/resources/merge-resolve/.gitted/objects/d5/ec1152fe25e9fec00189eb00b3db71db24c218
Commit message (Expand)AuthorAgeFilesLines
* Rename tests-clar to testsBen Straub2013-11-141-0/+0
* merge!Edward Thomson2013-04-301-0/+0