Here's what the conflicts dialog looks like when we're unable to find any editor:

@billygriffin @ampinsk @outofambit just going to call out what I'd like input on from a UX side as part of addressing this bug:

• given all the whitespace on the right-hand column when you don't have an active editor, should we try and make use of that space? i'll see if i can put together a screenshot of what this looks like with long paths
• should we make the command line link more prominent - i.e. above the list of files - if that's what they need to use?

Recap of discussion with @shiftkey, @ampinsk, @tierninho, and me:

From @shiftkey's screenshot in #6109 (comment), we'll add in buttons as normal next to each conflict.

• The buttons will say "Open in editor," cased appropriately
• The buttons will be disabled
• Hovering over each button will have a tooltip that says: "No editor configured in Preferences > Advanced"

One extra thing:

"No editor configured in Preferences > Advanced"

This is a platform-specific label too (Preferences on macOS, Options on the others)

Some updated screenshots based on the feedback from above:

LGTM!