Utilize branch names and file status type in merge conflict dialog #6782
Description
follow on from #6777 and #6062. excellent write up at #6777 (comment)
Summary
Integrate language that uses the branch name and file status in the merge conflicts dialog.
For example:
Instead of: "Using our version"
We say: "Using deleted version from branch-name"
Before:
After:
