Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"