Delete and modified are swapped in conflict resolution

[mattkang]

When resolving deleted file merge conflicts, the prompt text is incorrect. It currently reads:

"filename.txt" has been deleted on refs/heads/master and modified on the other branch.

Do you want to keep the modified version or delete it?

I believe this should instead read:

"filename.txt" has been deleted on refs/heads/feature and modified on the current branch.

Do you want to keep the modified version or delete it?

[GitFiend]

Thanks for reporting this. I'll take a look.