This involved a trivial merge conflict fix in terminal.c because of
the way the cherry-pick 73b41feba5af998 differed from its original
bdbd5f429c79a67.
But a more significant rework was needed in windows/console.c, because
the updates to confirm_weak_* conflicted with the changes on main to
abstract out the ConsoleIO system.