Support mergetool of any scm by loading necessary files at startup #13
Comments
idbrii
added a commit
to idbrii/vim-mergetool
that referenced
this issue
Apr 16, 2020
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.
idbrii
added a commit
to idbrii/vim-mergetool
that referenced
this issue
Apr 16, 2020
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.
idbrii
added a commit
to idbrii/vim-mergetool
that referenced
this issue
Apr 18, 2020
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.
idbrii
added a commit
to idbrii/vim-mergetool
that referenced
this issue
Apr 18, 2020
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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
vim-mergetool only supports scms that name their temp files BASE, REMOTE, LOCAL.
Svn names the files something like this:
file.cs.r404563
file.cs.r404217
file.cs
file.cs.mine
You should be able to start vim with something like this:
Requiring a specific order would make elements 0:3 of
argv()those arguments in that order.I think it's better to provide an scm-agnostic way to map the files, so maybe a variable
g:mergetool_arg_order = 'mblr'that sets up those files could work.The text was updated successfully, but these errors were encountered: