summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve
Commit message (Expand)AuthorAgeFilesLines
* Rename tests-clar to testsBen Straub2013-11-14408-0/+538