Merge branch 'sb/submodule-short-status' into next
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"