summaryrefslogtreecommitdiff
path: root/tests/resources/twowaymerge.git
Commit message (Expand)AuthorAgeFilesLines
* Rename tests-clar to testsBen Straub2013-11-1440-0/+44