Support any scm by assigning args at startup#17
Open
idbrii wants to merge 1 commit intosamoshkin:masterfrom
Open
Support any scm by assigning args at startup#17idbrii wants to merge 1 commit intosamoshkin:masterfrom
idbrii wants to merge 1 commit intosamoshkin:masterfrom
Conversation
Fix samoshkin#13: add g:mergetool_args_order. Add g:mergetool_args_order to renames arguments as hidden files with the same names as git (BASE, REMOTE, LOCAL). This allows mergetool to behave as if invoked by git-mergetool for any scm.
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.
Fix #13: add g:mergetool_args_order.
Add g:mergetool_args_order to renames arguments as hidden files with the
same names as git (BASE, REMOTE, LOCAL). This allows mergetool to behave
as if invoked by git-mergetool for any scm.