Highlight conflicts on diff of conflicted file with the rest of the changes
Background
In #276918 (comment 974980765), we received a feedback wherein it's confusing that when a file is conflicted and it has other changes that weren't conflicted, only the conflicted parts will be shown.
Proposal
Highlight the conflicted parts of the diff file with the rest of the changes. Technical implementation TBD (needs investigation).
Also consider if the non-conflicted changes can also be shown in the conflict editor.
This page may contain information related to upcoming products, features and functionality. It is important to note that the information presented is for informational purposes only, so please do not rely on the information for purchasing or planning purposes. Just like with all projects, the items mentioned on the page are subject to change or delay, and the development, release, and timing of any products, features, or functionality remain at the sole discretion of GitLab Inc.