We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
I'm running this command from a terminal inside OpenVSCode-Server:
jj \ --config-toml='ui.merge-editor="openvscode-server"' \ --config-toml='merge-tools.openvscode-server.merge-args=["--wait", "--merge", "$left", "$right", "$base", "$output"]' \ resolve
While I'm able to do the merge as I might expect, saving and closing the file does not return / complete the --wait.
--wait
Is there something else I can do here to successfully use OpenVSCode-Server as my merge tool?
The text was updated successfully, but these errors were encountered:
No branches or pull requests
I'm running this command from a terminal inside OpenVSCode-Server:
While I'm able to do the merge as I might expect, saving and closing the file does not return / complete the
--wait
.Is there something else I can do here to successfully use OpenVSCode-Server as my merge tool?
The text was updated successfully, but these errors were encountered: