simon-git: putty (main): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  977e725a No-op merge of the test_split_into_argv cherry-pick.

Repository:     https://git.tartarus.org/simon/putty.git
On the web:     https://git.tartarus.org/?p=simon/putty.git
Branch updated: main
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2021-04-21 22:05:54

commit 977e725a4591e78495224fac5c9fefa18aed5477
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=977e725a4591e78495224fac5c9fefa18aed5477;hp=e06cf1ec40c30cded8d277e43fd4f1f3079a0e5f
Merge: e06cf1ec 15ca55c5
Author: Simon Tatham <anakin at pobox.com>
Date:   Wed Apr 21 22:03:55 2021 +0100

    No-op merge of the test_split_into_argv cherry-pick.
    
    This merge was done with '-s ours', and doesn't change the contents of
    main. It just records the relationship so that the next 0.75 -> main
    merge (if any) shouldn't have trouble.