Fix error handling during directory merge.

Authored by mreeves on Jun 2 2020, 2:33 AM.

Description

Fix error handling during directory merge.

(cherry picked from commit bde64f7c4f8fbc5df83f3cb194069258867fb49e)

Details

Committed
mreevesJun 2 2020, 2:47 AM
Parents
R983:2d56cd943e00: Only give one error dialog per diff
Branches
Unknown
Tags
Unknown