summaryrefslogtreecommitdiff
path: root/test/catlfish-test-local-merge-2.cfg
Commit message (Expand)AuthorAgeFilesLines
* Preliminary merge secondary support. Change merge db to lowercase.Magnus Ahltorp2015-07-311-0/+18