The permissions on this repository are being updated. This may take a while.
During this time, you or some of the project's contributors may not be able
to push to this repository.
ec4a669ticket 49551 - correctly handle subordinates and tombstone numsubordinates
ticket 49551 - correctly handle subordinates and tombstone numsubordinates
Additional fix for a case where an ADD is directly turned into a tombstone and teh tombstone
is resurrected as conflict
Reviewed by: Mark, thanks