Respect :horizontal modifier in :Git difftool -y#2460
Open
niklaas wants to merge 1 commit intotpope:masterfrom
Open
Respect :horizontal modifier in :Git difftool -y#2460niklaas wants to merge 1 commit intotpope:masterfrom
niklaas wants to merge 1 commit intotpope:masterfrom
Conversation
The no-prompt code path in s:ToolStream() hardcoded 'vertical' when calling Gdiffsplit!. This meant :horizontal G difftool -y was ignored. Derive the split direction from a:mods so that :horizontal produces horizontal diffs while preserving vertical as the default. Fixes tpope#2435
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
1 participant
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.
The no-prompt code path in s:ToolStream() hardcoded 'vertical' when
calling Gdiffsplit!. This meant :horizontal G difftool -y was ignored.
Derive the split direction from a:mods so that :horizontal produces
horizontal diffs while preserving vertical as the default.
Fixes #2435