summaryrefslogtreecommitdiff
path: root/test/catlfish-test-local-merge.cfg
Commit message (Expand)AuthorAgeFilesLines
* Generate config from master config. Verify responses in merge.py.Magnus Ahltorp2015-03-231-0/+8