Is there an existing issue for this?

• I have searched the existing issues

OS/Web Information

• Web Browser: chrome
• Local OS: macos
• Remote OS: linux
• Remote Architecture: amd64
• code-server --version:

1.96.2
08cbdfbdf11925e8a14ee03de97b942bba7e8a94
x64

Steps to Reproduce

1. Open a terminal in code-server
2. Run echo a > a; echo out > out
3. Run code-server --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-server --wait --merge command exit (bad)

Expected

3-way merge tab should pop up. There should be a "complete merge" button on bottom right, or failing that closing the merge tab should make code-server --wait --merge return successfully (exit 0).

Note simply editing a file with code-server --wait does work as expected. (code-server --wait command returns when tab is closed.)

Actual

There is no "complete merge" button. Closing the merge tab just closes the tab, and code-server --wait --merge continues running.

Logs

Screenshot/Video

No response

Does this bug reproduce in native VS Code?

I did not test native VS Code

Does this bug reproduce in GitHub Codespaces?

I did not test GitHub Codespaces

Are you accessing code-server over a secure context?

• I am using a secure context.

Notes

No response