GitLab

During processing conflict the local entity might be deleted, e.g. when
there is a remote update upon local tombstone.

Bug: 1093024
Change-Id: I29341f26b000771a012cbe23f0373e9cb8c00802
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2366742Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Rushan Suleymanov <rushans@google.com>
Cr-Commit-Position: refs/heads/master@{#800134}