Explicit conflict visualization while comparing two branches #18672
Description
The feature request
When you compare two branches in order to prepare a merge it could be relevant to explicitly show the liste of conflicting files
Proposed solution
On my side I have developped a bash extension called nogit that can preview (in a ugly way) the merge by combining behind, ahead and conflicting files (taking into account auto-mergeable conflicts)
A pretty version of that could be integrated in a tab to help user to manage the merge.
I use nogit for several years and this feature is really decisive for complex merge.
Additional context
No response