conflict resolution support with add-only Set test
Merge pull request #2 from istvan-soos/master

conflict resolution support