aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge (follow)
Commit message (Expand)AuthorAgeFilesLines
* Support merging merge modulesRob Mensching2020-05-223-0/+35