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