summaryrefslogtreecommitdiff
path: root/tests/data/merge_sources
Commit message (Expand)AuthorAgeFilesLines
* README: Mention move of revision control to git.HEADtrunkScott Moser2016-08-1037-257/+0
* Fix the cloud config merging so that it is backwards compat.Joshua Harlow2013-05-098-2/+36
* 1 more test that does some list appending.Joshua Harlow2013-05-073-0/+19
* A few more test files.Joshua Harlow2013-05-0712-0/+140
* More merging adjustments.Joshua Harlow2013-05-034-2/+23
* Add a bunch of new merging test files + runner.Joshua Harlow2013-04-2312-0/+43