Created
December 21, 2018 07:33
-
-
Save VKen/48c94249773be148a022da8923ef9207 to your computer and use it in GitHub Desktop.
Fix for vimdiff vim-plugins clashes between minibufexpl.vim and splice.vim when using as git mergetool in git config
This file contains 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
| [diff] | |
| tool = gvimdiff | |
| [merge] | |
| # Note: `sjl/splice.vim` is unmaintained and has a bug with one | |
| # of the views. Use fork from `albfan/splice.vim` instead | |
| tool = splice | |
| [mergetool "splice"] | |
| # minibufexpl.vim uses some window space, splice's default calculation | |
| # and resizing did not take that into account therefore, switch off | |
| # minibufexpl.vim's window auto start, so splice can control window space fully | |
| cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c \"let g:miniBufExplAutoStart = 0\" -c 'SpliceInit'" | |
| # trust splice's exit code to tell merge success or fail | |
| # have to use the internal shortcut `<leader>q` or `<leader>CC` in splice | |
| trustExitCode = true |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment