Fix upstream merge CI failure with 'winaltkeys'#1376
Merged
ychin merged 1 commit intomacvim-dev:masterfrom Mar 2, 2023
Merged
Conversation
Make sure to block testing 'winaltkeys' only if the option is supported. Also, while we are at it, add a test to make sure MacVim-specific options have proper error checking to prevent bad merge conflict resolution from accidentally removing said logic.
19c995b to
db2afe5
Compare
tono
pushed a commit
to tono/macvim
that referenced
this pull request
Mar 21, 2023
…failure Fix upstream merge CI failure with 'winaltkeys'
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Make sure to block testing 'winaltkeys' only if the option is supported.
Also, while we are at it, add a test to make sure MacVim-specific options have proper error checking to prevent bad merge conflict resolution from accidentally removing said logic.