summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/objects/4c/9fac0707f8d4195037ae5a681aa48626491541
Commit message (Expand)AuthorAgeFilesLines
* Rename tests-clar to testsBen Straub2013-11-141-0/+0