Highlight diff in the conflict view #1793
Description
Is your feature request related to a problem? Please describe.
SOmetimes when I got message The file was overwritten. Your current changes cannot be auto-saved. Please choose how to proceed. I need to choose which version I want to use.
It is difficult to find a difference in long files.
Describe the solution you'd like
Some kind of highlight in places where files differ
Describe alternatives you've considered
Copy-pasting to another app like meld
Additional context
Example from meld:
