Quanah Gibson-Mount pushed to branch OPENLDAP_REL_ENG_2_4 at openldap / OpenLDAP

Commits:

• ae9d44f7
  by Howard Chu at 2020-08-26T20:57:52+00:00

  ITS#9329 Re-fix merge_state
  
  A bit uglier but more straightforward.
  

1 changed file:

• servers/slapd/syncrepl.c