Do you mean displaying conflicts directly in the diff? At the moment I believe an alert is shown on the file if there's a conflict, and the comparison changes t

Do you mean displaying conflicts directly in the diff? At the moment I believe an alert is shown on the file if there's a conflict, and the comparison changes to the source branch and the base of the target branch. Depending on the complexity of the conflict, you are able to resolve via the conflict resolution UI (otherwise you'll have to just resolve it locally).