summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/objects/cc
Commit message (Expand)AuthorAgeFilesLines
* Don't try to merge binary filesEdward Thomson2014-01-201-0/+2
* Rename tests-clar to testsBen Straub2013-11-141-0/+2