Merge branch 'jl/status-added-submodule-is-never-ignored'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"