code --wait --merge never exits

[anguslees]

Does this issue occur when all extensions are disabled?: Yes/No

• VS Code Version:

$ code --version
1.100.2
848b80aeb52026648a8ff9f7c45a9b0a80641e2e
x64

Steps to Reproduce:

1. Open a terminal in codespaces
2. Run echo a > a; echo out > out
3. Run code --wait --merge a a a out
4. 3-way merge tab pops up (good)
5. Save file, close tab, try anything. No way to make code --wait --merge command exit (bad)