mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-07-13 17:17:37 -05:00

This involved a trivial merge conflict fix in terminal.c because of the way the cherry-pick73b41feba5
differed from its originalbdbd5f429c
. 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.