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