summaryrefslogtreecommitdiff
path: root/test/config
Commit message (Expand)AuthorAgeFilesLines
* System tests for external mergeMagnus Ahltorp2014-10-244-0/+105