cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

using DirDiff in vimdiff

Browse source
This commit is contained in:
Cyryl Plotnicki-Chudyk 2015-03-16 14:23:49 +01:00
parent e14d748d77
commit 9f283a7986
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitconfig_includes.common
View file

@ -18,6 +18,8 @@
tool = vimdiff tool = vimdiff
[difftool] [difftool]
prompt = false prompt = false
[difftool "vimdiff"]
cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off'
[merge] [merge]
tool = kdiff3 tool = kdiff3
[mergetool] [mergetool]

3
.gitmodules vendored
View file

@ -41,3 +41,6 @@
[submodule ".vim/bundle/splice"] [submodule ".vim/bundle/splice"]
path = .vim/bundle/splice path = .vim/bundle/splice
url = https://github.com/sjl/splice.vim.git url = https://github.com/sjl/splice.vim.git
[submodule ".vim/bundle/vim-dirdiff"]
path = .vim/bundle/vim-dirdiff
url = git://github.com/will133/vim-dirdiff

1
.vim/bundle/vim-dirdiff Submodule

@ -0,0 +1 @@
Subproject commit 779185c33cccada094f59aa1345ffe19d2e581e4