summaryrefslogtreecommitdiff
path: root/tests/resources/mergedrepo/conflicts-one.txt
Commit message (Expand)AuthorAgeFilesLines
* Rename tests-clar to testsBen Straub2013-11-141-0/+5