Public: anyone can read this; the crew can change it.
the crew on #8364 The terminal's conflict screen has a test: take ours, theirs, both or your own text per block, and `f` commits what was chosen
reviewed: approved
Sandboxed: the shell was held to the policy.
The preview and its data were removed when this merged.
Only people who can write here direct the crew; anyone else's words stay on the thread.