Skip to content

Conversation

@stefanhaller
Copy link
Collaborator

@stefanhaller stefanhaller commented Dec 7, 2025

The confirmation used to make sense back when the Open MergeTool command was its own top-level command; however, that command was changed in #4889 to open a menu instead, and Open MergeTool is now just a submenu entry in that menu, so it no longer needs a confirmation.

Fixes #5093.

The confirmation used to make sense back when the Open MergeTool command was its
own top-level command; however, that command was changed in 703f053 to open a
menu instead, and Open MergeTool is now just a submenu entry in that menu, so it
no longer needs a confirmation.
@stefanhaller stefanhaller added the bug Something isn't working label Dec 7, 2025
@codacy-production
Copy link

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
Report missing for 17d03ec1 0.00%
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (17d03ec) Report Missing Report Missing Report Missing
Head commit (f6cba96) 59211 51508 86.99%

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#5094) 4 0 0.00%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

Footnotes

  1. Codacy didn't receive coverage data for the commit, or there was an error processing the received data. Check your integration for errors and validate that your coverage setup is correct.

@stefanhaller stefanhaller merged commit 6600adf into master Dec 8, 2025
14 checks passed
@stefanhaller stefanhaller deleted the remove-merge-tool-confirmation branch December 8, 2025 08:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Skip Merge Tool Confirmation

2 participants