100644 blob 059890f30e463c1dcfecd6fbbba7b5ee895c6c07	MergeConsumer.java
100644 blob fba9e9ee3582a4c12273760ac8a9f42166de57c2	MergeConsumer2.java
100644 blob fb0896897c07a83319e8d3f3a84acc326ce4fa8f	MergeProvider.java
100644 blob c6fa7ffb56f4d9222ff38ce2e65a6e121249cb95	MergeProvider2.java
040000 tree cf1352c6f586d3e038314236c31c8c8a491f6c6d	api
040000 tree 88c0e0263a93a745fd7de0e1e89db1aec91e364d	impl
100644 blob 5912e78772e4d75c4a4464de716d68577ff8c151	merge-consumer.xml
100644 blob be4646ff213dd09fb094c61a68caa19ee7b4a8cc	merge-consumer2.xml
100644 blob db164393cdb54dcce62d0d37d66b7a398ef31d5b	merge-provider.xml
100644 blob 2e28674d8a9c350e1127b6e751b8c18b058fb962	merge-provider2.xml