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