Fix merging the merge result of a merge where at least one of the sets had x/mrefs
Merge pull request #1972 from bartcharbon/master

Fix merging the merge result of a merge where at least one of the sets h...