Merge branch 'bw/push-submodule-only'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"