Fork 1.78: Merge conflict when file was deleted ("deleted" and "modified" switched places)

[sunriselink]

Steps to reproduce

1. Create file on "master" branch
2. Create branch "edit-file" at "master"
3. On branch "edit-file" change something in file
4. On "master" branch remove this file
5. Merge "edit-file" into "master"

Fork 1.77 - Branch "edit-file" indicate file as Modified, branch "master" - Deleted (Expected behavior)

Fork 1.78 - Branch "edit-file" indicate file as Deleted, branch "master" - Modified (after click "Delete" file will be added as new)

[DanPristupov]

Thank you for the bug report. I'll release hotfix tomorrow.

[DanPristupov]

I've released the 1.78.1 hotfix.