summaryrefslogtreecommitdiff
path: root/tests/data/merge_sources/expected5.yaml
Commit message (Expand)AuthorAgeFilesLines
* README: Mention move of revision control to git.HEADtrunkScott Moser2016-08-101-7/+0
* More merging adjustments.Joshua Harlow2013-05-031-0/+7