summaryrefslogtreecommitdiff
path: root/tests/data/merge_sources/source5-1.yaml
AgeCommit message (Collapse)Author
2013-05-03More merging adjustments.Joshua Harlow
Looks like this should be in pretty good shape and has passed some of the basic backwards compat. merging tests that I added.