~cyplo/dotfiles

b3152441b6e5f2cc58f83626f0b9c197c367e624 — Cyryl Plotnicki-Chudyk 6 years ago 4e47173
using DirDiff in vimdiff
3 files changed, 6 insertions(+), 0 deletions(-)

M .gitconfig_includes.common
M .gitmodules
A .vim/bundle/vim-dirdiff
M .gitconfig_includes.common => .gitconfig_includes.common +2 -0
@@ 18,6 18,8 @@
    tool = vimdiff
[difftool]
    prompt = false
[difftool "vimdiff"]
    cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off'
[merge]
    tool = kdiff3
[mergetool]

M .gitmodules => .gitmodules +3 -0
@@ 41,3 41,6 @@
[submodule ".vim/bundle/splice"]
	path = .vim/bundle/splice
	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

A .vim/bundle/vim-dirdiff => .vim/bundle/vim-dirdiff +1 -0
@@ 0,0 1,1 @@
Subproject commit 779185c33cccada094f59aa1345ffe19d2e581e4